From cd68c65aa1aea1b287962cc60b5ac0497dd113bc Mon Sep 17 00:00:00 2001 From: Sean Kilgarriff Date: Thu, 30 Nov 2023 08:48:52 -0600 Subject: [PATCH] fix: update to the latest clippy lints --- server/src/ban_manager.rs | 4 ++-- server/src/connection.rs | 2 +- server/src/server.rs | 4 ++-- server/src/session.rs | 2 +- server/src/session_list.rs | 4 ++-- server/src/tcp.rs | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/src/ban_manager.rs b/server/src/ban_manager.rs index cf7540f24c..8a4a5633ed 100644 --- a/server/src/ban_manager.rs +++ b/server/src/ban_manager.rs @@ -140,8 +140,8 @@ async fn purge_expired_tasks(shared: Arc) { // state as new keys have been set to expire early. This is done by // looping. tokio::select! { - _ = tokio::time::sleep_until(when) => {} - _ = shared.background_task.notified() => {} + () = tokio::time::sleep_until(when) => {} + () = shared.background_task.notified() => {} } } else { // There are no keys expiring in the future. Wait until the task is diff --git a/server/src/connection.rs b/server/src/connection.rs index 036a432b24..5c3530d26e 100644 --- a/server/src/connection.rs +++ b/server/src/connection.rs @@ -117,7 +117,7 @@ async fn write_message( } } } - _ = cancel_token.cancelled() => { + () = cancel_token.cancelled() => { //@todo reword this trace!("write loop hit cancellation token."); diff --git a/server/src/server.rs b/server/src/server.rs index cbb0fb14af..b6944d4ad2 100644 --- a/server/src/server.rs +++ b/server/src/server.rs @@ -70,7 +70,7 @@ where error!(cause = ?e, "Global thread {} failed.", global_name); } } - _ = cancel_token.cancelled() => { + () = cancel_token.cancelled() => { info!("Global thread {} is shutting down from shutdown message.", global_name); } @@ -146,7 +146,7 @@ where error!(cause = %err, "failed to accept"); }; }, - _ = cancel_token.cancelled() => {} + () = cancel_token.cancelled() => {} } let start = Instant::now(); diff --git a/server/src/session.rs b/server/src/session.rs index 896e3c46b8..1ca8344083 100644 --- a/server/src/session.rs +++ b/server/src/session.rs @@ -218,7 +218,7 @@ impl Session { worker_id: Uuid, ) { //@todo has to be an easier way to reuse worker_name here - debug!(id = ?self.inner.id, "Registered Worker {worker_id} ({}) Session ID: {session_id}", worker_name.clone().unwrap_or(String::new())); + debug!(id = ?self.inner.id, "Registered Worker {worker_id} ({}) Session ID: {session_id}", worker_name.clone().unwrap_or_default()); let worker = Miner::new( self.id().clone(), diff --git a/server/src/session_list.rs b/server/src/session_list.rs index 2dde19311c..f5ea116632 100644 --- a/server/src/session_list.rs +++ b/server/src/session_list.rs @@ -87,7 +87,7 @@ impl SessionList { "Session List sending {} miners reconnect message.", self.inner.state.len() ); - for entry in self.inner.state.iter() { + for entry in &self.inner.state { let miner = entry.value(); if let Err(e) = miner.send_raw(msg.clone()) { warn!(connection_id = %miner.id(), cause = %e, "Failed to send shutdown message"); @@ -105,7 +105,7 @@ impl SessionList { ); //@todo we need to parallize this async - now we can do it without async though. - for entry in self.inner.state.iter() { + for entry in &self.inner.state { entry.value().shutdown(); } } diff --git a/server/src/tcp.rs b/server/src/tcp.rs index 9d13b24f61..9d2289f139 100644 --- a/server/src/tcp.rs +++ b/server/src/tcp.rs @@ -93,7 +93,7 @@ impl frame, } }, - _ = &mut sleep => { + () = &mut sleep => { if enabled!(Level::DEBUG) { error!( id = &self.id.to_string(), ip = &address.to_string(), "Session Parse Frame Timeout"); } @@ -101,14 +101,14 @@ impl That is //handled in retarget, so let's check that out. - _ = session_cancel_token.cancelled() => { + () = session_cancel_token.cancelled() => { //@todo work on these errors, if enabled!(Level::DEBUG) { error!( id = &self.id.to_string(), ip = &address.to_string(), "Session Disconnected"); } break; }, - _ = self.cancel_token.cancelled() => { + () = self.cancel_token.cancelled() => { // If a shutdown signal is received, return from `run`. // This will result in the task terminating. break;