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, } -impl Into for RegisterResponseCopy { - fn into(self) -> RegisterResponse { +impl From 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 for AdminHeaders { - fn into(self) -> Headers { +impl From 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 for ManagerHeaders { - fn into(self) -> Headers { +impl From 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 for ManagerHeadersLoose { - fn into(self) -> Headers { +impl From 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, } } }