From 71d50d79c236bf766dc42bb02e88c103c006a9b6 Mon Sep 17 00:00:00 2001 From: Simon Wicky Date: Tue, 19 May 2026 14:21:12 +0200 Subject: [PATCH] fix clippy 1.95 lints (#6794) --- clients/native/src/websocket/handler.rs | 2 ++ .../src/client/real_messages_control/message_handler.rs | 4 ++-- common/nym_offline_compact_ecash/src/proofs/mod.rs | 4 +--- common/verloc/src/measurements/sender.rs | 5 ++--- nym-api/src/network_monitor/monitor/sender.rs | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/clients/native/src/websocket/handler.rs b/clients/native/src/websocket/handler.rs index 2ea7cac609..e9ade8d046 100644 --- a/clients/native/src/websocket/handler.rs +++ b/clients/native/src/websocket/handler.rs @@ -472,6 +472,7 @@ impl Handler { fn prepare_reconstructed_binary( reconstructed_messages: Vec, ) -> Vec> { + #[allow(clippy::result_large_err)] // TODO : remove this once tungstenite is updated reconstructed_messages .into_iter() .map(ServerResponse::Received) @@ -484,6 +485,7 @@ fn prepare_reconstructed_binary( fn prepare_reconstructed_text( reconstructed_messages: Vec, ) -> Vec> { + #[allow(clippy::result_large_err)] // TODO : remove this once tungstenite is updated reconstructed_messages .into_iter() .map(ServerResponse::Received) diff --git a/common/client-core/src/client/real_messages_control/message_handler.rs b/common/client-core/src/client/real_messages_control/message_handler.rs index 77677b749e..c4aca70c9b 100644 --- a/common/client-core/src/client/real_messages_control/message_handler.rs +++ b/common/client-core/src/client/real_messages_control/message_handler.rs @@ -439,7 +439,7 @@ where let mut pending_acks = Vec::with_capacity(fragments.len()); let mut to_forward: HashMap<_, Vec<_>> = HashMap::new(); - for (raw, prepared) in fragments.into_iter().zip(prepared_fragments.into_iter()) { + for (raw, prepared) in fragments.into_iter().zip(prepared_fragments) { let lane = raw.0; let FragmentWithMaxRetransmissions { fragment, @@ -670,7 +670,7 @@ where Ok(fragments .into_iter() - .zip(reply_surbs.into_iter()) + .zip(reply_surbs) .map(|(fragment, reply_surb)| { // unwrap here is fine as we know we have a valid topology #[allow(clippy::unwrap_used)] diff --git a/common/nym_offline_compact_ecash/src/proofs/mod.rs b/common/nym_offline_compact_ecash/src/proofs/mod.rs index c1a19acc8c..bd3cc63e89 100644 --- a/common/nym_offline_compact_ecash/src/proofs/mod.rs +++ b/common/nym_offline_compact_ecash/src/proofs/mod.rs @@ -31,9 +31,7 @@ where // instead we could maybe use the `from_bytes` variant and adding some suffix // when computing the digest until we produce a valid scalar. let mut bytes = [0u8; 64]; - let pad_size = 64usize - .checked_sub(D::OutputSize::to_usize()) - .unwrap_or_default(); + let pad_size = 64usize.saturating_sub(D::OutputSize::to_usize()); bytes[pad_size..].copy_from_slice(&digest); diff --git a/common/verloc/src/measurements/sender.rs b/common/verloc/src/measurements/sender.rs index f27c531603..86fab92f47 100644 --- a/common/verloc/src/measurements/sender.rs +++ b/common/verloc/src/measurements/sender.rs @@ -109,8 +109,8 @@ impl PacketSender { let mut results = Vec::with_capacity(self.packets_per_node); - let mut seq = self.random_sequence_number(); - for _ in 0..self.packets_per_node { + let start_seq = self.random_sequence_number(); + for seq in start_seq..start_seq + self.packets_per_node as u64 { let packet = EchoPacket::new(seq, &self.identity); let start = Instant::now(); // TODO: should we get the start time after or before actually sending the data? @@ -210,7 +210,6 @@ impl PacketSender { let time_taken = Instant::now().duration_since(start); results.push(time_taken); - seq += 1; sleep(self.delay_between_packets).await; } diff --git a/nym-api/src/network_monitor/monitor/sender.rs b/nym-api/src/network_monitor/monitor/sender.rs index 1e87c9e433..3f53dcfd08 100644 --- a/nym-api/src/network_monitor/monitor/sender.rs +++ b/nym-api/src/network_monitor/monitor/sender.rs @@ -448,7 +448,7 @@ impl PacketSender { // // we need to keep clients alive until the test finishes so that we could keep receiving ForEachConcurrentClientUse::new( - stream::iter(stream_data.into_iter()), + stream::iter(stream_data), max_concurrent_clients, |(packets, fresh_data)| async move { Self::send_gateway_packets(