Clippy fixes

lib/src/network/client.rs

@@ -112,9 +112,8 @@ impl Client {
                     break;
                 }
                 branch_to_reload = reload_index_rx.recv() => {
-                    match branch_to_reload {
-                        Ok(branch_to_reload) => self.reload_index(&branch_to_reload),
-                        Err(_) => (),
+                    if let Ok(branch_to_reload) = branch_to_reload {
+                        self.reload_index(&branch_to_reload);
                     }
                 }
             }

lib/src/store/block_expiration_tracker.rs

@@ -232,16 +232,13 @@ async fn run_task(
         let now = SystemTime::now();
 
         if expires_at > now {
-            match expires_at.duration_since(now) {
-                Ok(duration) => {
-                    select! {
-                        _ = sleep(duration) => (),
-                        _ = expiration_time_rx.changed() => {
-                            continue;
-                        }
+            if let Ok(duration) = expires_at.duration_since(now) {
+                select! {
+                    _ = sleep(duration) => (),
+                    _ = expiration_time_rx.changed() => {
+                        continue;
                     }
                 }
-                Err(_) => (),
             }
 
             // Check it's still the oldest block.
@@ -398,11 +395,11 @@ mod test {
 
         writer
             .link_block(
-                &branch_id,
+                branch_id,
                 &rand::random(),
                 &block_id,
                 SingleBlockPresence::Present,
-                &write_keys,
+                write_keys,
             )
             .await
             .unwrap();

lib/src/store/leaf_node.rs

@@ -165,7 +165,7 @@ pub(super) async fn set_missing_if_expired(
          WHERE block_id = ? AND block_presence = ?",
     )
     .bind(SingleBlockPresence::Missing)
-    .bind(&block)
+    .bind(block)
     .bind(SingleBlockPresence::Expired)
     .execute(tx)
     .await?;

lib/src/store/mod.rs

@@ -105,10 +105,7 @@ impl Store {
     }
 
     pub async fn block_expiration(&self) -> Option<Duration> {
-        match &*self.block_expiration_tracker.read().await {
-            Some(tracker) => Some(tracker.block_expiration()),
-            None => None,
-        }
+        (*self.block_expiration_tracker.read().await).as_ref().map(|tracker| tracker.block_expiration())
     }
 
     /// Acquires a `Reader`
@@ -283,10 +280,8 @@ impl Reader {
 
         let result = block::read(self.db(), id, buffer).await;
 
-        if matches!(result, Err(Error::BlockNotFound)) {
-            if self.set_as_missing_if_expired(id).await? {
-                block_tracker.require(*id);
-            }
+        if matches!(result, Err(Error::BlockNotFound)) && self.set_as_missing_if_expired(id).await? {
+            block_tracker.require(*id);
         }
 
         result
@@ -308,7 +303,7 @@ impl Reader {
             return Ok(false);
         }
 
-        let nodes: Vec<_> = leaf_node::load_parent_hashes(&mut tx, &block_id)
+        let nodes: Vec<_> = leaf_node::load_parent_hashes(&mut tx, block_id)
             .try_collect()
             .await?;
 
@@ -782,9 +777,9 @@ impl WriteTransaction {
 
         for _ in 0..INNER_LAYER_COUNT {
             for node in &nodes {
-                receive_filter.remove(self.db(), &node).await?;
+                receive_filter.remove(self.db(), node).await?;
 
-                let mut parents = inner_node::load_parent_hashes(self.db(), &node);
+                let mut parents = inner_node::load_parent_hashes(self.db(), node);
 
                 while let Some(parent) = parents.try_next().await? {
                     next_layer.insert(parent);