From 2257f3f292f4ab8a1d3a61b33e69750fa70e99a6 Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Thu, 9 Jan 2025 16:31:43 +0700 Subject: [PATCH 1/4] fix(mplex): clippy::precedence --- muxers/mplex/src/codec.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/muxers/mplex/src/codec.rs b/muxers/mplex/src/codec.rs index a4a04d1964d..20ee6bb4ed6 100644 --- a/muxers/mplex/src/codec.rs +++ b/muxers/mplex/src/codec.rs @@ -299,7 +299,7 @@ impl Encoder for Codec { role: Endpoint::Listener, }, data, - } => (num << 3 | 1, data), + } => ((num << 3) | 1, data), Frame::Data { stream_id: LocalStreamId { @@ -307,35 +307,35 @@ impl Encoder for Codec { role: Endpoint::Dialer, }, data, - } => (num << 3 | 2, data), + } => ((num << 3) | 2, data), Frame::Close { stream_id: LocalStreamId { num, role: Endpoint::Listener, }, - } => (num << 3 | 3, Bytes::new()), + } => ((num << 3) | 3, Bytes::new()), Frame::Close { stream_id: LocalStreamId { num, role: Endpoint::Dialer, }, - } => (num << 3 | 4, Bytes::new()), + } => ((num << 3) | 4, Bytes::new()), Frame::Reset { stream_id: LocalStreamId { num, role: Endpoint::Listener, }, - } => (num << 3 | 5, Bytes::new()), + } => ((num << 3) | 5, Bytes::new()), Frame::Reset { stream_id: LocalStreamId { num, role: Endpoint::Dialer, }, - } => (num << 3 | 6, Bytes::new()), + } => ((num << 3) | 6, Bytes::new()), }; let mut header_buf = encode::u64_buffer(); From 49b00c809c26d4da22157f3d5d6c45d86e20fb77 Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Thu, 9 Jan 2025 16:33:43 +0700 Subject: [PATCH 2/4] fix(kad): clippy::useless_conversion --- protocols/kad/src/query/peers/closest/disjoint.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/protocols/kad/src/query/peers/closest/disjoint.rs b/protocols/kad/src/query/peers/closest/disjoint.rs index 70ded360c7e..a26a31b5215 100644 --- a/protocols/kad/src/query/peers/closest/disjoint.rs +++ b/protocols/kad/src/query/peers/closest/disjoint.rs @@ -552,7 +552,6 @@ mod tests { .flatten() .collect::>() .into_iter() - .map(Key::from) .collect::>(); deduplicated.sort_unstable_by(|a, b| { From 134d796dba6021ef1331b2787cb0efbadfe05ba4 Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Thu, 9 Jan 2025 16:34:09 +0700 Subject: [PATCH 3/4] fix(kad): clippy::unnecessary_map_or --- protocols/kad/src/kbucket/bucket.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs index 244525238ec..b838d54ede5 100644 --- a/protocols/kad/src/kbucket/bucket.rs +++ b/protocols/kad/src/kbucket/bucket.rs @@ -225,7 +225,7 @@ where // The bucket is full with connected nodes. Drop the pending node. return None; } - debug_assert!(self.first_connected_pos.map_or(true, |p| p > 0)); // (*) + debug_assert!(self.first_connected_pos.is_none_or(|p| p > 0)); // (*) // The pending node will be inserted. let inserted = pending.node.clone(); // A connected pending node goes at the end of the list for From 0e8e558b329bc11ca0fc8460c18c90bc6e3ba7e3 Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Thu, 9 Jan 2025 16:39:32 +0700 Subject: [PATCH 4/4] chore(kad): fmt --- protocols/kad/src/kbucket/bucket.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs index b838d54ede5..cbc6adf4d5c 100644 --- a/protocols/kad/src/kbucket/bucket.rs +++ b/protocols/kad/src/kbucket/bucket.rs @@ -226,7 +226,7 @@ where return None; } debug_assert!(self.first_connected_pos.is_none_or(|p| p > 0)); // (*) - // The pending node will be inserted. + // The pending node will be inserted. let inserted = pending.node.clone(); // A connected pending node goes at the end of the list for // the connected peers, removing the least-recently connected.