Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bwinf
medal
Commits
7bf809c2
Commit
7bf809c2
authored
Oct 12, 2020
by
Robert Czechowski
Browse files
Replace 'self: &mut Self' by '&mut self' as rust 1.47 now starts to complain about that
parent
e6c53706
Pipeline
#860
passed with stages
in 34 minutes and 20 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/webfw_iron.rs
View file @
7bf809c2
...
...
@@ -176,12 +176,12 @@ trait RequestSession {
}
impl
<
'a
,
'b
>
RequestSession
for
Request
<
'a
,
'b
>
{
fn
get_session_token
(
self
:
&
mut
S
elf
)
->
Option
<
String
>
{
fn
get_session_token
(
&
mut
s
elf
)
->
Option
<
String
>
{
let
session_token
=
self
.session
()
.get
::
<
SessionToken
>
()
.unwrap
();
(|
st
:
Option
<
SessionToken
>
|
->
Option
<
String
>
{
Some
(
st
?
.token
)
})(
session_token
)
}
fn
require_session_token
(
self
:
&
mut
S
elf
)
->
IronResult
<
String
>
{
fn
require_session_token
(
&
mut
s
elf
)
->
IronResult
<
String
>
{
match
self
.session
()
.get
::
<
SessionToken
>
()
.unwrap
()
{
Some
(
SessionToken
{
token
:
session
})
=>
Ok
(
session
),
_
=>
{
...
...
@@ -202,7 +202,7 @@ impl<'a, 'b> RequestSession for Request<'a, 'b> {
}
}
fn
expect_session_token
(
self
:
&
mut
S
elf
)
->
IronResult
<
String
>
{
fn
expect_session_token
(
&
mut
s
elf
)
->
IronResult
<
String
>
{
match
self
.session
()
.get
::
<
SessionToken
>
()
.unwrap
()
{
Some
(
SessionToken
{
token
:
session
})
=>
Ok
(
session
),
_
=>
Err
(
IronError
{
error
:
Box
::
new
(
SessionError
{
message
:
...
...
@@ -213,22 +213,22 @@ impl<'a, 'b> RequestSession for Request<'a, 'b> {
}
trait
RequestRouterParam
{
fn
get_str
(
self
:
&
mut
S
elf
,
key
:
&
str
)
->
Option
<
String
>
;
fn
get_int
<
T
:
::
std
::
str
::
FromStr
>
(
self
:
&
mut
S
elf
,
key
:
&
str
)
->
Option
<
T
>
;
fn
expect_int
<
T
:
::
std
::
str
::
FromStr
>
(
self
:
&
mut
S
elf
,
key
:
&
str
)
->
IronResult
<
T
>
;
fn
expect_str
(
self
:
&
mut
S
elf
,
key
:
&
str
)
->
IronResult
<
String
>
;
fn
get_str
(
&
mut
s
elf
,
key
:
&
str
)
->
Option
<
String
>
;
fn
get_int
<
T
:
::
std
::
str
::
FromStr
>
(
&
mut
s
elf
,
key
:
&
str
)
->
Option
<
T
>
;
fn
expect_int
<
T
:
::
std
::
str
::
FromStr
>
(
&
mut
s
elf
,
key
:
&
str
)
->
IronResult
<
T
>
;
fn
expect_str
(
&
mut
s
elf
,
key
:
&
str
)
->
IronResult
<
String
>
;
}
impl
<
'a
,
'b
>
RequestRouterParam
for
Request
<
'a
,
'b
>
{
fn
get_str
(
self
:
&
mut
S
elf
,
key
:
&
str
)
->
Option
<
String
>
{
fn
get_str
(
&
mut
s
elf
,
key
:
&
str
)
->
Option
<
String
>
{
Some
(
self
.extensions.get
::
<
Router
>
()
?
.find
(
key
)
?
.to_owned
())
}
fn
get_int
<
T
:
::
std
::
str
::
FromStr
>
(
self
:
&
mut
S
elf
,
key
:
&
str
)
->
Option
<
T
>
{
fn
get_int
<
T
:
::
std
::
str
::
FromStr
>
(
&
mut
s
elf
,
key
:
&
str
)
->
Option
<
T
>
{
Some
(
self
.extensions.get
::
<
Router
>
()
?
.find
(
key
)
?
.parse
::
<
T
>
()
.ok
()
?
)
}
fn
expect_int
<
T
:
::
std
::
str
::
FromStr
>
(
self
:
&
mut
S
elf
,
key
:
&
str
)
->
IronResult
<
T
>
{
fn
expect_int
<
T
:
::
std
::
str
::
FromStr
>
(
&
mut
s
elf
,
key
:
&
str
)
->
IronResult
<
T
>
{
match
self
.get_int
::
<
T
>
(
key
)
{
Some
(
i
)
=>
Ok
(
i
),
_
=>
Err
(
IronError
{
error
:
Box
::
new
(
SessionError
{
message
:
...
...
@@ -237,7 +237,7 @@ impl<'a, 'b> RequestRouterParam for Request<'a, 'b> {
}
}
fn
expect_str
(
self
:
&
mut
S
elf
,
key
:
&
str
)
->
IronResult
<
String
>
{
fn
expect_str
(
&
mut
s
elf
,
key
:
&
str
)
->
IronResult
<
String
>
{
match
self
.get_str
(
key
)
{
Some
(
s
)
=>
Ok
(
s
),
_
=>
Err
(
IronError
{
error
:
Box
::
new
(
SessionError
{
message
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment