From c3d7a0704a8f3db080a71efa99a5814268336bf8 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Mon, 8 May 2023 13:57:21 +0200
Subject: [PATCH] A little bit of cleanup

---
 crates/matrix-sdk-base/src/client.rs              |  2 +-
 crates/matrix-sdk-crypto/src/gossiping/machine.rs | 12 +++++-------
 crates/matrix-sdk-crypto/src/store/mod.rs         |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/crates/matrix-sdk-base/src/client.rs b/crates/matrix-sdk-base/src/client.rs
index 39d4de779..1016d46ce 100644
--- a/crates/matrix-sdk-base/src/client.rs
+++ b/crates/matrix-sdk-base/src/client.rs
@@ -427,7 +427,7 @@ impl BaseClient {
                     }
                 }
                 Err(e) => {
-                    warn!("Error deserializing event {:?}", e);
+                    warn!("Error deserializing event {e:?}");
                 }
             }
 
diff --git a/crates/matrix-sdk-crypto/src/gossiping/machine.rs b/crates/matrix-sdk-crypto/src/gossiping/machine.rs
index f2cc61cb0..4275c8d84 100644
--- a/crates/matrix-sdk-crypto/src/gossiping/machine.rs
+++ b/crates/matrix-sdk-crypto/src/gossiping/machine.rs
@@ -733,16 +733,14 @@ impl GossipMachine {
         room_id: &RoomId,
         event: &EncryptedEvent,
     ) -> Result<bool, CryptoStoreError> {
-        Ok(if let Some(info) = event.room_key_info(room_id).map(|i| i.into()) {
+        if let Some(info) = event.room_key_info(room_id).map(|i| i.into()) {
             if self.should_request_key(&info).await? {
                 self.request_key_helper(info).await?;
-                true
-            } else {
-                false
+                return Ok(true);
             }
-        } else {
-            false
-        })
+        }
+
+        Ok(false)
     }
 
     /// Save an outgoing key info.
diff --git a/crates/matrix-sdk-crypto/src/store/mod.rs b/crates/matrix-sdk-crypto/src/store/mod.rs
index 0548a54a9..5a8fa473e 100644
--- a/crates/matrix-sdk-crypto/src/store/mod.rs
+++ b/crates/matrix-sdk-crypto/src/store/mod.rs
@@ -413,7 +413,7 @@ impl Store {
         self.inner.identity.lock().await.reset().await;
     }
 
-    ///  PrivateCrossSigningIdentity associated with this store
+    /// PrivateCrossSigningIdentity associated with this store
     pub(crate) fn private_identity(&self) -> Arc<Mutex<PrivateCrossSigningIdentity>> {
         self.inner.identity.clone()
     }