aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJake Howard <[email protected]>2021-03-27 14:19:57 +0000
committerJake Howard <[email protected]>2021-03-27 14:19:57 +0000
commit6b1daeba0533516c6d50fd2cebcc1e8060fd6df2 (patch)
tree3a4f33e595b903214f809a87a4de72d8d7cbe8c7
parent9f1240d8d95eeb7fc17e746355cf6ace1577a4ee (diff)
downloadvaultwarden-6b1daeba0533516c6d50fd2cebcc1e8060fd6df2.tar.gz
vaultwarden-6b1daeba0533516c6d50fd2cebcc1e8060fd6df2.zip
Implement `From` over `Into`
https://rust-lang.github.io/rust-clippy/master/index.html#from_over_into
-rw-r--r--src/api/core/two_factor/u2f.rs10
-rw-r--r--src/auth.rs30
2 files changed, 20 insertions, 20 deletions
diff --git a/src/api/core/two_factor/u2f.rs b/src/api/core/two_factor/u2f.rs
index 7934ab63..f841240b 100644
--- a/src/api/core/two_factor/u2f.rs
+++ b/src/api/core/two_factor/u2f.rs
@@ -131,12 +131,12 @@ struct RegisterResponseCopy {
pub error_code: Option<NumberOrString>,
}
-impl Into<RegisterResponse> for RegisterResponseCopy {
- fn into(self) -> RegisterResponse {
+impl From<RegisterResponseCopy> for RegisterResponse {
+ fn from(r: RegisterResponseCopy) -> RegisterResponse {
RegisterResponse {
- registration_data: self.registration_data,
- version: self.version,
- client_data: self.client_data,
+ registration_data: r.registration_data,
+ version: r.version,
+ client_data: r.client_data,
}
}
}
diff --git a/src/auth.rs b/src/auth.rs
index 4041cc6b..d1398bbf 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -450,12 +450,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for AdminHeaders {
}
}
-impl Into<Headers> for AdminHeaders {
- fn into(self) -> Headers {
+impl From<AdminHeaders> for Headers {
+ fn from(h: AdminHeaders) -> Headers {
Headers {
- host: self.host,
- device: self.device,
- user: self.user,
+ host: h.host,
+ device: h.device,
+ user: h.user,
}
}
}
@@ -529,12 +529,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for ManagerHeaders {
}
}
-impl Into<Headers> for ManagerHeaders {
- fn into(self) -> Headers {
+impl From<ManagerHeaders> for Headers {
+ fn from(h: ManagerHeaders) -> Headers {
Headers {
- host: self.host,
- device: self.device,
- user: self.user,
+ host: h.host,
+ device: h.device,
+ user: h.user,
}
}
}
@@ -571,12 +571,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for ManagerHeadersLoose {
}
}
-impl Into<Headers> for ManagerHeadersLoose {
- fn into(self) -> Headers {
+impl From<ManagerHeadersLoose> for Headers {
+ fn from(h: ManagerHeadersLoose) -> Headers {
Headers {
- host: self.host,
- device: self.device,
- user: self.user,
+ host: h.host,
+ device: h.device,
+ user: h.user,
}
}
}