[workspace] clippy and fmt (#3644)

Author: andresilva

consensus/src/marshal/core/actor.rs

@@ -525,11 +525,7 @@ where
                         response.send_lossy(info);
                     }
                     Message::GetVerified { round, response } => {
-                        let block = self
-                            .cache
-                            .get_verified(round)
-                            .await
-                            .map(Into::into);
+                        let block = self.cache.get_verified(round).await.map(Into::into);
                         response.send_lossy(block);
                     }
                     Message::Forward {
@@ -559,7 +555,8 @@ where
                         // `cache_verified` is a no-op because the round is below
                         // the retention floor (and no longer is required by consensus
                         // to make progress).
-                        self.cache_verified(round, block.digest(), block.clone()).await;
+                        self.cache_verified(round, block.digest(), block.clone())
+                            .await;
                         // Retain the block in memory so the subsequent
                         // `Forward` can broadcast it without reloading from
                         // storage. An older retained proposal (if any) is
@@ -805,9 +802,7 @@ where
                 }
 
                 // Batch verify and process all delivers.
-                needs_sync |= self
-                    .verify_delivered(delivers, &mut application)
-                    .await;
+                needs_sync |= self.verify_delivered(delivers, &mut application).await;
 
                 // Attempt to fill gaps before handling produce requests (so we
                 // can serve data we just received).

consensus/src/simplex/actors/voter/mod.rs

@@ -8717,9 +8717,7 @@ mod tests {
                 select! {
                     msg = batcher_receiver.recv() => match msg.unwrap() {
                         batcher::Message::Update {
-                            current,
-                            response,
-                            ..
+                            current, response, ..
                         } if current > target_view => {
                             // Signal leader inactivity to trigger the timeout path.
                             response.send(Some(TimeoutReason::Inactivity)).unwrap();

p2p/src/lib.rs

@@ -346,11 +346,7 @@ stability_scope!(BETA {
         /// "follow that progress" (but not contribute to it). We call the former "primary" and the latter "secondary".
         /// When both are tracked, mechanisms favor "primary" peers but continue to replicate data to "secondary" peers (
         /// often both gossiping data to them and answering requests from them).
-        fn track<R>(
-            &mut self,
-            id: u64,
-            peers: R,
-        ) -> impl Future<Output = ()> + Send
+        fn track<R>(&mut self, id: u64, peers: R) -> impl Future<Output = ()> + Send
         where
             R: Into<TrackedPeers<Self::PublicKey>> + Send;
     }
@@ -382,11 +378,7 @@ stability_scope!(BETA {
         /// "follow that progress" (but not contribute to it). We call the former "primary" and the latter "secondary".
         /// When both are tracked, mechanisms favor "primary" peers but continue to replicate data to "secondary" peers (
         /// often both gossiping data to them and answering requests from them).
-        fn track<R>(
-            &mut self,
-            id: u64,
-            peers: R,
-        ) -> impl Future<Output = ()> + Send
+        fn track<R>(&mut self, id: u64, peers: R) -> impl Future<Output = ()> + Send
         where
             R: Into<AddressableTrackedPeers<Self::PublicKey>> + Send;
 

resolver/src/p2p/mod.rs

@@ -496,7 +496,7 @@ mod tests {
                 event = cons_out1.recv() => {
                     panic!("fetch should wait for the initial peer set, got {event:?}");
                 },
-                _ = context.sleep(Duration::from_millis(200)) => {}
+                _ = context.sleep(Duration::from_millis(200)) => {},
             };
 
             oracle

storage/src/qmdb/any/batch.rs

@@ -1688,7 +1688,7 @@ mod tests {
                 },
             ),
         ];
-        base_diff.sort_by(|a, b| a.0.cmp(&b.0));
+        base_diff.sort_by_key(|a| a.0);
 
         let creates = extract_parent_deleted_creates(&mut mutations, &base_diff);
 

storage/src/qmdb/immutable/mod.rs

@@ -1253,12 +1253,12 @@ pub(super) mod test {
         let mut kvs_first: Vec<(Digest, Digest)> = (0u64..5)
             .map(|i| (Sha256::hash(&i.to_be_bytes()), Sha256::fill(i as u8)))
             .collect();
-        kvs_first.sort_by(|a, b| a.0.cmp(&b.0));
+        kvs_first.sort_by_key(|a| a.0);
 
         let mut kvs_second: Vec<(Digest, Digest)> = (5u64..10)
             .map(|i| (Sha256::hash(&i.to_be_bytes()), Sha256::fill(i as u8)))
             .collect();
-        kvs_second.sort_by(|a, b| a.0.cmp(&b.0));
+        kvs_second.sort_by_key(|a| a.0);
 
         // Parent batch: set keys 0..5.
         let mut parent = db.new_batch();