diff --git a/matrix_sdk/src/error.rs b/matrix_sdk/src/error.rs index 1c2f9e57..1b0fc1bf 100644 --- a/matrix_sdk/src/error.rs +++ b/matrix_sdk/src/error.rs @@ -92,7 +92,7 @@ pub enum Error { /// An IO error happened. #[error(transparent)] - IO(#[from] IoError), + Io(#[from] IoError), /// An error occurred in the Matrix client library. #[error(transparent)] diff --git a/matrix_sdk_base/src/store/sled_store/store_key.rs b/matrix_sdk_base/src/store/sled_store/store_key.rs index ffb2ec55..28d9820b 100644 --- a/matrix_sdk_base/src/store/sled_store/store_key.rs +++ b/matrix_sdk_base/src/store/sled_store/store_key.rs @@ -48,6 +48,7 @@ pub enum Error { Random(#[from] RngError), } +#[allow(clippy::from_over_into)] impl Into for Error { fn into(self) -> StoreError { match self { diff --git a/matrix_sdk_common/src/deserialized_responses.rs b/matrix_sdk_common/src/deserialized_responses.rs index bec23c63..275cb367 100644 --- a/matrix_sdk_common/src/deserialized_responses.rs +++ b/matrix_sdk_common/src/deserialized_responses.rs @@ -282,16 +282,16 @@ impl TryFrom> for MemberEvent { } } -impl Into> for MemberEvent { - fn into(self) -> SyncStateEvent { +impl From for SyncStateEvent { + fn from(other: MemberEvent) -> SyncStateEvent { SyncStateEvent { - content: self.content, - event_id: self.event_id, - sender: self.sender, - origin_server_ts: self.origin_server_ts, - state_key: self.state_key.to_string(), - prev_content: self.prev_content, - unsigned: self.unsigned, + content: other.content, + event_id: other.event_id, + sender: other.sender, + origin_server_ts: other.origin_server_ts, + state_key: other.state_key.to_string(), + prev_content: other.prev_content, + unsigned: other.unsigned, } } } @@ -319,12 +319,12 @@ impl TryFrom> for StrippedMemberEvent { } } -impl Into> for StrippedMemberEvent { - fn into(self) -> StrippedStateEvent { - StrippedStateEvent { - content: self.content, - sender: self.sender, - state_key: self.state_key.to_string(), +impl From for StrippedStateEvent { + fn from(other: StrippedMemberEvent) -> Self { + Self { + content: other.content, + sender: other.sender, + state_key: other.state_key.to_string(), } } } diff --git a/matrix_sdk_crypto/src/file_encryption/key_export.rs b/matrix_sdk_crypto/src/file_encryption/key_export.rs index da394edf..304ded6b 100644 --- a/matrix_sdk_crypto/src/file_encryption/key_export.rs +++ b/matrix_sdk_crypto/src/file_encryption/key_export.rs @@ -52,7 +52,7 @@ pub enum KeyExportError { UnsupportedVersion, /// The MAC of the encrypted payload is invalid. #[error("The MAC of the encrypted payload is invalid.")] - InvalidMAC, + InvalidMac, /// The decrypted key export isn't valid UTF-8. #[error(transparent)] InvalidUtf8(#[from] std::string::FromUtf8Error), @@ -64,7 +64,7 @@ pub enum KeyExportError { Decode(#[from] DecodeError), /// The key export doesn't all the required fields. #[error(transparent)] - IO(#[from] std::io::Error), + Io(#[from] std::io::Error), } /// Try to decrypt a reader into a list of exported room keys. @@ -220,7 +220,7 @@ fn decrypt_helper(ciphertext: &str, passphrase: &str) -> Result::new_varkey(hmac_key).expect("Can't create an HMAC object"); hmac.update(&decoded[0..ciphertext_end]); - hmac.verify(&mac).map_err(|_| KeyExportError::InvalidMAC)?; + hmac.verify(&mac).map_err(|_| KeyExportError::InvalidMac)?; let mut ciphertext = &mut decoded[ciphertext_start..ciphertext_end]; let mut aes = Aes256Ctr::new_var(&key, &iv).expect("Can't create an AES object"); diff --git a/matrix_sdk_crypto/src/identities/user.rs b/matrix_sdk_crypto/src/identities/user.rs index fa5e7b2e..09beb2dd 100644 --- a/matrix_sdk_crypto/src/identities/user.rs +++ b/matrix_sdk_crypto/src/identities/user.rs @@ -90,18 +90,21 @@ impl From for UserSigningPubkey { } } +#[allow(clippy::from_over_into)] impl Into for MasterPubkey { fn into(self) -> CrossSigningKey { self.0.as_ref().clone() } } +#[allow(clippy::from_over_into)] impl Into for UserSigningPubkey { fn into(self) -> CrossSigningKey { self.0.as_ref().clone() } } +#[allow(clippy::from_over_into)] impl Into for SelfSigningPubkey { fn into(self) -> CrossSigningKey { self.0.as_ref().clone()