From e3b03fb55967c6396a854d0e31759401c6f03b73 Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Thu, 20 Feb 2025 19:18:49 +1300 Subject: [PATCH 1/5] webrtc: fix clippy::double_ended_iterator_last --- transports/webrtc/src/tokio/udp_mux.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transports/webrtc/src/tokio/udp_mux.rs b/transports/webrtc/src/tokio/udp_mux.rs index dcb88592c9b..090f99a8ef2 100644 --- a/transports/webrtc/src/tokio/udp_mux.rs +++ b/transports/webrtc/src/tokio/udp_mux.rs @@ -561,7 +561,7 @@ fn ufrag_from_stun_message(buffer: &[u8], local_ufrag: bool) -> Result Ok(s.to_owned()), From f5951f2ed9696fba3738b9644e5cd94b4efcdebc Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Thu, 20 Feb 2025 19:19:12 +1300 Subject: [PATCH 2/5] kad: fix clippy::useless_nonzero_new_unchecked --- protocols/kad/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protocols/kad/src/lib.rs b/protocols/kad/src/lib.rs index 91983b9aaf7..5201832a2ba 100644 --- a/protocols/kad/src/lib.rs +++ b/protocols/kad/src/lib.rs @@ -88,7 +88,7 @@ pub use record::{store, Key as RecordKey, ProviderRecord, Record}; /// DHT should agree on the choices made for (1) and (2). /// /// The current value is `20`. -pub const K_VALUE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(20) }; +pub const K_VALUE: NonZeroUsize = NonZeroUsize::new(20).unwrap(); /// The `α` parameter of the Kademlia specification. /// @@ -98,7 +98,7 @@ pub const K_VALUE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(20) }; /// locating the closest peers to a key. /// /// The current value is `3`. -pub const ALPHA_VALUE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(3) }; +pub const ALPHA_VALUE: NonZeroUsize = NonZeroUsize::new(3).unwrap(); pub const PROTOCOL_NAME: StreamProtocol = protocol::DEFAULT_PROTO_NAME; From 145be8490cb17010ded0a6537ed1926fbc76906e Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Thu, 20 Feb 2025 19:19:33 +1300 Subject: [PATCH 3/5] kad: allow clippy::manual_div_ceil Must be fixed in the uint::construct_unit macro. --- protocols/kad/src/kbucket/key.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/protocols/kad/src/kbucket/key.rs b/protocols/kad/src/kbucket/key.rs index ce14a3f779a..4080657d239 100644 --- a/protocols/kad/src/kbucket/key.rs +++ b/protocols/kad/src/kbucket/key.rs @@ -17,6 +17,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. +#![allow(clippy::manual_div_ceil)] use std::{ borrow::Borrow, From 7d48faad9eec68935be864c71a0f63e7c697bfe2 Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Thu, 20 Feb 2025 19:21:05 +1300 Subject: [PATCH 4/5] autonat: fix clippy::manual_repeat_n --- protocols/autonat/src/v2/client/handler/dial_request.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/protocols/autonat/src/v2/client/handler/dial_request.rs b/protocols/autonat/src/v2/client/handler/dial_request.rs index 61f564505eb..9fb54c87a49 100644 --- a/protocols/autonat/src/v2/client/handler/dial_request.rs +++ b/protocols/autonat/src/v2/client/handler/dial_request.rs @@ -2,7 +2,7 @@ use std::{ collections::VecDeque, convert::Infallible, io, - iter::{once, repeat}, + iter::{once, repeat_n}, task::{Context, Poll}, time::Duration, }; @@ -326,8 +326,7 @@ where { let count_full = num_bytes / DATA_FIELD_LEN_UPPER_BOUND; let partial_len = num_bytes % DATA_FIELD_LEN_UPPER_BOUND; - for req in repeat(DATA_FIELD_LEN_UPPER_BOUND) - .take(count_full) + for req in repeat_n(DATA_FIELD_LEN_UPPER_BOUND, count_full) .chain(once(partial_len)) .filter(|e| *e > 0) .map(|data_count| { From 7ff3a63d3130fb71d05acc6b42e5b131c3384818 Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Thu, 20 Feb 2025 22:19:15 +1300 Subject: [PATCH 5/5] quick-protobuf-codec: fix clippy::manual_repeat_n --- misc/quick-protobuf-codec/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/quick-protobuf-codec/src/lib.rs b/misc/quick-protobuf-codec/src/lib.rs index d49315a54c3..28b53946899 100644 --- a/misc/quick-protobuf-codec/src/lib.rs +++ b/misc/quick-protobuf-codec/src/lib.rs @@ -252,7 +252,7 @@ mod tests { let mut src = BytesMut::new(); src.extend_from_slice(encoded_length); - src.extend(std::iter::repeat(0).take(length)); + src.extend(std::iter::repeat_n(0, length)); src }