From 6fc703b4a3c4b63a93365756fa4bbf1e10cefecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 12 Nov 2021 17:51:26 +0100
Subject: [PATCH] fix(crypto): Fix a bunch of clippy warnings

---
 crates/matrix-sdk-crypto/src/olm/account.rs                | 6 +++---
 crates/matrix-sdk-crypto/src/olm/group_sessions/inbound.rs | 1 +
 crates/matrix-sdk-crypto/src/verification/mod.rs           | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/matrix-sdk-crypto/src/olm/account.rs b/crates/matrix-sdk-crypto/src/olm/account.rs
index 12afea16b..c3a2765ea 100644
--- a/crates/matrix-sdk-crypto/src/olm/account.rs
+++ b/crates/matrix-sdk-crypto/src/olm/account.rs
@@ -50,7 +50,7 @@ use tracing::{debug, info, trace, warn};
 
 use super::{
     EncryptionSettings, InboundGroupSession, OutboundGroupSession, PrivateCrossSigningIdentity,
-    Session, Utility,
+    Session,
 };
 use crate::{
     error::{EventError, OlmResult, SessionCreationError},
@@ -686,10 +686,10 @@ impl ReadOnlyAccount {
         self.inner.lock().await.sign(string)
     }
 
+    #[cfg(feature = "backups_v1")]
     pub(crate) fn is_signed(&self, json: &mut Value) -> Result<(), SignatureError> {
         let signing_key = self.identity_keys.ed25519();
-
-        let utility = Utility::new();
+        let utility = crate::olm::Utility::new();
 
         utility.verify_json(
             &self.user_id,
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 ca20a9cbe..8e1927c21 100644
--- a/crates/matrix-sdk-crypto/src/olm/group_sessions/inbound.rs
+++ b/crates/matrix-sdk-crypto/src/olm/group_sessions/inbound.rs
@@ -232,6 +232,7 @@ impl InboundGroupSession {
         self.backed_up.store(false, SeqCst)
     }
 
+    #[cfg(feature = "backups_v1")]
     pub(crate) fn mark_as_backed_up(&self) {
         self.backed_up.store(true, SeqCst)
     }
diff --git a/crates/matrix-sdk-crypto/src/verification/mod.rs b/crates/matrix-sdk-crypto/src/verification/mod.rs
index 087e8dd70..f006c9836 100644
--- a/crates/matrix-sdk-crypto/src/verification/mod.rs
+++ b/crates/matrix-sdk-crypto/src/verification/mod.rs
@@ -42,7 +42,6 @@ use ruma::{
             done::{KeyVerificationDoneEventContent, ToDeviceKeyVerificationDoneEventContent},
             Relation,
         },
-        secret::request::SecretName,
         AnyMessageEventContent, AnyToDeviceEventContent,
     },
     DeviceId, DeviceIdBox, DeviceKeyId, EventId, RoomId, UserId,
@@ -549,11 +548,12 @@ impl IdentitiesBeingVerified {
     }
 
     async fn request_missing_secrets(&self) -> Result<Vec<GossipRequest>, CryptoStoreError> {
+        #[allow(unused_mut)]
         let mut secrets = self.private_identity.get_missing_secrets().await;
 
         #[cfg(feature = "backups_v1")]
         if self.store.inner.load_backup_keys().await?.recovery_key.is_none() {
-            secrets.push(SecretName::RecoveryKey);
+            secrets.push(ruma::events::secret::request::SecretName::RecoveryKey);
         }
 
         Ok(GossipMachine::request_missing_secrets(self.user_id(), secrets))