From d977ca4a24b36fccb2d46e9aadf9d6bf9a16a5b7 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Thu, 23 Apr 2026 22:21:15 +0200 Subject: [PATCH] fix new cargo clippy lints --- src/api/s3/post_object.rs | 10 ++++------ src/block/repair.rs | 2 +- src/net/peering.rs | 6 ++---- src/rpc/rpc_helper.rs | 6 +----- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/api/s3/post_object.rs b/src/api/s3/post_object.rs index e89e9ea9..26fd454c 100644 --- a/src/api/s3/post_object.rs +++ b/src/api/s3/post_object.rs @@ -473,12 +473,10 @@ where )))); } } - Poll::Ready(None) => { - if !self.length.contains(&self.read) { - return Poll::Ready(Some(Err(Error::bad_request( - "File size does not match policy", - )))); - } + Poll::Ready(None) if !self.length.contains(&self.read) => { + return Poll::Ready(Some(Err(Error::bad_request( + "File size does not match policy", + )))); } _ => {} } diff --git a/src/block/repair.rs b/src/block/repair.rs index 343574f8..9499d4ab 100644 --- a/src/block/repair.rs +++ b/src/block/repair.rs @@ -648,7 +648,7 @@ impl BlockStoreIterator { let mut cum_cap = 0; let mut todo = vec![]; - for (dir, cap) in data_layout.data_dirs.iter().zip(dir_cap.into_iter()) { + for (dir, cap) in data_layout.data_dirs.iter().zip(dir_cap) { let progress_min = (cum_cap * PROGRESS_FP) / sum_cap; let progress_max = ((cum_cap + cap as u64) * PROGRESS_FP) / sum_cap; cum_cap += cap as u64; diff --git a/src/net/peering.rs b/src/net/peering.rs index b96b6f52..1d0eac4e 100644 --- a/src/net/peering.rs +++ b/src/net/peering.rs @@ -313,10 +313,8 @@ impl PeeringManager { to_ping.push(*id); } } - PeerConnState::Waiting(_, t) => { - if Instant::now() >= t { - to_retry.push(*id); - } + PeerConnState::Waiting(_, t) if Instant::now() >= t => { + to_retry.push(*id); } _ => (), } diff --git a/src/rpc/rpc_helper.rs b/src/rpc/rpc_helper.rs index 0805c1cb..44c0f66f 100644 --- a/src/rpc/rpc_helper.rs +++ b/src/rpc/rpc_helper.rs @@ -241,11 +241,7 @@ impl RpcHelper { ) .with_context(Context::current_with_span(span)) .await; - Ok(to - .iter() - .cloned() - .zip(resps.into_iter()) - .collect::>()) + Ok(to.iter().cloned().zip(resps).collect::>()) } pub async fn broadcast(