From f72a14890d87e9efdacdc6eea5aebdb171789a99 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Mon, 4 Jul 2022 11:41:49 +0200 Subject: [PATCH] chore(crypto) Make Clippy happy. --- crates/matrix-sdk-crypto/src/identities/user.rs | 4 ++-- crates/matrix-sdk-crypto/src/olm/account.rs | 4 ++-- crates/matrix-sdk-crypto/src/olm/group_sessions/inbound.rs | 6 +++--- crates/matrix-sdk-crypto/src/olm/signing/mod.rs | 2 +- crates/matrix-sdk-crypto/src/store/mod.rs | 2 +- crates/matrix-sdk-crypto/src/verification/mod.rs | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/identities/user.rs b/crates/matrix-sdk-crypto/src/identities/user.rs index 2400f7829..6ca61fd9d 100644 --- a/crates/matrix-sdk-crypto/src/identities/user.rs +++ b/crates/matrix-sdk-crypto/src/identities/user.rs @@ -686,7 +686,7 @@ impl ReadOnlyUserIdentity { ) -> Result { master_key.verify_subkey(&self_signing_key)?; - Ok(Self { user_id: (&*master_key.0.user_id).into(), master_key, self_signing_key }) + Ok(Self { user_id: (*master_key.0.user_id).into(), master_key, self_signing_key }) } #[cfg(test)] @@ -799,7 +799,7 @@ impl ReadOnlyOwnUserIdentity { master_key.verify_subkey(&user_signing_key)?; Ok(Self { - user_id: (&*master_key.0.user_id).into(), + user_id: (*master_key.0.user_id).into(), master_key, self_signing_key, user_signing_key, diff --git a/crates/matrix-sdk-crypto/src/olm/account.rs b/crates/matrix-sdk-crypto/src/olm/account.rs index 71406dce0..5183086b5 100644 --- a/crates/matrix-sdk-crypto/src/olm/account.rs +++ b/crates/matrix-sdk-crypto/src/olm/account.rs @@ -729,8 +729,8 @@ impl ReadOnlyAccount { let identity_keys = account.identity_keys(); Ok(Self { - user_id: (&*pickle.user_id).into(), - device_id: (&*pickle.device_id).into(), + user_id: (*pickle.user_id).into(), + device_id: (*pickle.device_id).into(), inner: Arc::new(Mutex::new(account)), identity_keys: Arc::new(identity_keys), shared: Arc::new(AtomicBool::from(pickle.shared)), diff --git a/crates/matrix-sdk-crypto/src/olm/group_sessions/inbound.rs b/crates/matrix-sdk-crypto/src/olm/group_sessions/inbound.rs index 035ff6099..1c32a6ed5 100644 --- a/crates/matrix-sdk-crypto/src/olm/group_sessions/inbound.rs +++ b/crates/matrix-sdk-crypto/src/olm/group_sessions/inbound.rs @@ -180,7 +180,7 @@ impl InboundGroupSession { first_known_index, history_visibility: None.into(), signing_keys: sender_claimed_key.into(), - room_id: (&*content.room_id).into(), + room_id: (*content.room_id).into(), forwarding_chains: forwarding_chains.into(), imported: true, backed_up: AtomicBool::new(false).into(), @@ -292,7 +292,7 @@ impl InboundGroupSession { history_visibility: pickle.history_visibility.into(), first_known_index, signing_keys: pickle.signing_key.into(), - room_id: (&*pickle.room_id).into(), + room_id: (*pickle.room_id).into(), forwarding_chains: pickle.forwarding_chains.into(), backed_up: AtomicBool::from(pickle.backed_up).into(), imported: pickle.imported, @@ -447,7 +447,7 @@ impl From for InboundGroupSession { history_visibility: None.into(), first_known_index, signing_keys: key.sender_claimed_keys.into(), - room_id: (&*key.room_id).into(), + room_id: (*key.room_id).into(), forwarding_chains: key.forwarding_curve25519_key_chain.into(), imported: true, backed_up: AtomicBool::from(false).into(), diff --git a/crates/matrix-sdk-crypto/src/olm/signing/mod.rs b/crates/matrix-sdk-crypto/src/olm/signing/mod.rs index 8280e87a9..1b6ddb3ea 100644 --- a/crates/matrix-sdk-crypto/src/olm/signing/mod.rs +++ b/crates/matrix-sdk-crypto/src/olm/signing/mod.rs @@ -633,7 +633,7 @@ impl PrivateCrossSigningIdentity { let user_signing = keys.user_signing_key.map(UserSigning::from_pickle).transpose()?; Ok(Self { - user_id: (&*pickle.user_id).into(), + user_id: (*pickle.user_id).into(), shared: Arc::new(AtomicBool::from(pickle.shared)), master_key: Arc::new(Mutex::new(master)), self_signing_key: Arc::new(Mutex::new(self_signing)), diff --git a/crates/matrix-sdk-crypto/src/store/mod.rs b/crates/matrix-sdk-crypto/src/store/mod.rs index c7c1a9984..115e99041 100644 --- a/crates/matrix-sdk-crypto/src/store/mod.rs +++ b/crates/matrix-sdk-crypto/src/store/mod.rs @@ -579,7 +579,7 @@ impl Deref for Store { type Target = dyn CryptoStore; fn deref(&self) -> &Self::Target { - &*self.inner + self.inner.deref() } } diff --git a/crates/matrix-sdk-crypto/src/verification/mod.rs b/crates/matrix-sdk-crypto/src/verification/mod.rs index c3ea8c66c..a3c16fc50 100644 --- a/crates/matrix-sdk-crypto/src/verification/mod.rs +++ b/crates/matrix-sdk-crypto/src/verification/mod.rs @@ -20,7 +20,7 @@ mod qrcode; mod requests; mod sas; -use std::{collections::HashMap, sync::Arc}; +use std::{collections::HashMap, ops::Deref, sync::Arc}; use event_enums::OutgoingContent; pub use machine::VerificationMachine; @@ -148,7 +148,7 @@ impl VerificationStore { } pub fn inner(&self) -> &dyn CryptoStore { - &*self.inner + self.inner.deref() } }