clippy

2 files changed, 7 insertions, 9 deletions

diff --git a/client-native-lib/src/crypto.rs b/client-native-lib/src/crypto.rs
index ad36e02..2005d8b 100644
--- a/client-native-lib/src/crypto.rs
+++ b/client-native-lib/src/crypto.rs
@@ -12,8 +12,8 @@ use log::info;
 
 pub struct Key(Aes256Gcm);
 
-const CRYPTO_SALT: &'static str = "keksmeet/cryptosaltAAA==";
-const HASH_SALT: &'static str = "keksmeet/roomhashsaltA==";
+const CRYPTO_SALT: &str = "keksmeet/cryptosaltAAA==";
+const HASH_SALT: &str = "keksmeet/roomhashsaltA==";
 
 impl Key {
     pub fn derive(secret: &str) -> Self {
diff --git a/client-native-lib/src/instance.rs b/client-native-lib/src/instance.rs
index 517d979..899e48c 100644
--- a/client-native-lib/src/instance.rs
+++ b/client-native-lib/src/instance.rs
@@ -46,9 +46,9 @@ impl Instance {
 
     pub async fn join(&self, secret: Option<&str>) {
         info!("join room {secret:?}");
-        *self.key.write().await = secret.map(|secret| crypto::Key::derive(&secret));
+        *self.key.write().await = secret.map(crypto::Key::derive);
         self.send_packet(ServerboundPacket::Join {
-            hash: secret.map(|secret| hash(secret)),
+            hash: secret.map(hash),
         })
         .await;
     }
@@ -104,11 +104,9 @@ impl Instance {
             protocol::ClientboundPacket::ClientLeave { id } => {
                 if id == self.my_id().await {
                     // we left
-                } else {
-                    if let Some(peer) = self.peers.write().await.remove(&id) {
-                        peer.on_leave().await;
-                        self.event_handler.peer_leave(peer).await;
-                    }
+                } else if let Some(peer) = self.peers.write().await.remove(&id) {
+                    peer.on_leave().await;
+                    self.event_handler.peer_leave(peer).await;
                 }
             }
             protocol::ClientboundPacket::Message { sender, message } => {