chore: use captured identifiers

nitingujarathi · Apr 17, 2022 · bc64872 · bc64872
1 parent 372a5f3
commit bc64872
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/narwhal/consensus/src/subscriber.rs b/narwhal/consensus/src/subscriber.rs
@@ -161,13 +161,13 @@ impl<PublicKey: VerifyingKey> SubscriberServer<PublicKey> {
             let (socket, peer) = match listener.accept().await {
                 Ok(value) => value,
                 Err(e) => {
-                    debug!("Failed to establish connection with subscriber {}", e);
+                    debug!("Failed to establish connection with subscriber {e}");
                     continue;
                 }
             };
 
             // TODO [issue #109]: Limit the number of subscribers here rather than in the core.
-            debug!("Incoming connection established with {}", peer);
+            debug!("Incoming connection established with {peer}");
             let core_channel = self.tx_subscriber.clone();
             let consensus_store = self.consensus_store.clone();
             let certificate_store = self.certificate_store.clone();
@@ -288,15 +288,15 @@ impl<PublicKey: VerifyingKey> SubscriberConnection<PublicKey> {
                 Some(buffer) = self.socket.next() => match buffer {
                     Ok(bytes) => match bincode::deserialize(&bytes) {
                         Ok(request) => if let Err(e) = self.synchronize(request).await {
-                            error!("{}", e);
+                            error!("{e}");
                         },
                         Err(e) => {
                             debug!("subscriber {} sent malformed sync request: {}", self.peer, e);
                             break;
                         }
                     },
                     Err(e) => {
-                        debug!("Error while reading TCP stream: {}", e);
+                        debug!("Error while reading TCP stream: {e}");
                         break;
                     }
                 }

diff --git a/narwhal/consensus/src/tusk.rs b/narwhal/consensus/src/tusk.rs
@@ -171,7 +171,7 @@ impl<PublicKey: VerifyingKey> Consensus<PublicKey> {
                     .expect("Failed to send certificate to primary");
 
                 if let Err(e) = self.tx_output.send(output).await {
-                    warn!("Failed to output certificate: {}", e);
+                    warn!("Failed to output certificate: {e}");
                 }
             }
         }

diff --git a/narwhal/node/src/generate_format.rs b/narwhal/node/src/generate_format.rs
@@ -157,7 +157,7 @@ fn main() {
     match options.action {
         Action::Print => {
             let content = serde_yaml::to_string(&registry).unwrap();
-            println!("{}", content);
+            println!("{content}");
         }
         Action::Record => {
             let content = serde_yaml::to_string(&registry).unwrap();

diff --git a/narwhal/primary/src/block_waiter.rs b/narwhal/primary/src/block_waiter.rs
@@ -678,7 +678,7 @@ impl<PublicKey: VerifyingKey> BlockWaiter<PublicKey> {
         let r = match timeout(BATCH_RETRIEVE_TIMEOUT, batch_receiver).await {
             Ok(Ok(result)) => result.or(Err(BlockErrorType::BatchError)),
             Ok(Err(err)) => {
-                println!("Receiver error: {}", err);
+                println!("Receiver error: {err}");
                 Err(BlockErrorType::BatchError)
             }
             Err(_) => Err(BlockErrorType::BatchTimeout),