Jake Howard 4 years ago
parent
commit
6b1daeba05
No known key found for this signature in database GPG Key ID: 57AFB45680EDD477
  1. 10
      src/api/core/two_factor/u2f.rs
  2. 30
      src/auth.rs

10
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,
}
}
}

30
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,
}
}
}

Loading…
Cancel
Save