From 2d80616af22d19f52b07aa07bec8fa28be3b1c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= Date: Tue, 7 May 2024 00:14:59 +0100 Subject: [PATCH] chore: address clippy lints --- libp2p/src/bandwidth.rs | 8 ++++---- .../tests/{util.rs => util/mod.rs} | 0 misc/metrics/src/bandwidth.rs | 8 ++++---- misc/multistream-select/src/length_delimited.rs | 1 - misc/quickcheck-ext/src/lib.rs | 2 +- protocols/kad/src/kbucket.rs | 2 +- protocols/mdns/src/behaviour/iface/dns.rs | 2 +- protocols/mdns/src/behaviour/timer.rs | 4 ++-- transports/websocket-websys/src/web_context.rs | 3 +++ 9 files changed, 16 insertions(+), 14 deletions(-) rename misc/memory-connection-limits/tests/{util.rs => util/mod.rs} (100%) diff --git a/libp2p/src/bandwidth.rs b/libp2p/src/bandwidth.rs index b84cbb7e27b1..8931c5c41669 100644 --- a/libp2p/src/bandwidth.rs +++ b/libp2p/src/bandwidth.rs @@ -154,7 +154,7 @@ impl AsyncRead for InstrumentedStream { let this = self.project(); let num_bytes = ready!(this.inner.poll_read(cx, buf))?; this.sinks.inbound.fetch_add( - u64::try_from(num_bytes).unwrap_or(u64::max_value()), + u64::try_from(num_bytes).unwrap_or(u64::MAX), Ordering::Relaxed, ); Poll::Ready(Ok(num_bytes)) @@ -168,7 +168,7 @@ impl AsyncRead for InstrumentedStream { let this = self.project(); let num_bytes = ready!(this.inner.poll_read_vectored(cx, bufs))?; this.sinks.inbound.fetch_add( - u64::try_from(num_bytes).unwrap_or(u64::max_value()), + u64::try_from(num_bytes).unwrap_or(u64::MAX), Ordering::Relaxed, ); Poll::Ready(Ok(num_bytes)) @@ -184,7 +184,7 @@ impl AsyncWrite for InstrumentedStream { let this = self.project(); let num_bytes = ready!(this.inner.poll_write(cx, buf))?; this.sinks.outbound.fetch_add( - u64::try_from(num_bytes).unwrap_or(u64::max_value()), + u64::try_from(num_bytes).unwrap_or(u64::MAX), Ordering::Relaxed, ); Poll::Ready(Ok(num_bytes)) @@ -198,7 +198,7 @@ impl AsyncWrite for InstrumentedStream { let this = self.project(); let num_bytes = ready!(this.inner.poll_write_vectored(cx, bufs))?; this.sinks.outbound.fetch_add( - u64::try_from(num_bytes).unwrap_or(u64::max_value()), + u64::try_from(num_bytes).unwrap_or(u64::MAX), Ordering::Relaxed, ); Poll::Ready(Ok(num_bytes)) diff --git a/misc/memory-connection-limits/tests/util.rs b/misc/memory-connection-limits/tests/util/mod.rs similarity index 100% rename from misc/memory-connection-limits/tests/util.rs rename to misc/memory-connection-limits/tests/util/mod.rs diff --git a/misc/metrics/src/bandwidth.rs b/misc/metrics/src/bandwidth.rs index 2792e00612cb..ac6a4178ce9f 100644 --- a/misc/metrics/src/bandwidth.rs +++ b/misc/metrics/src/bandwidth.rs @@ -255,7 +255,7 @@ impl AsyncRead for InstrumentedStream { let num_bytes = ready!(this.inner.poll_read(cx, buf))?; this.metrics .inbound - .inc_by(u64::try_from(num_bytes).unwrap_or(u64::max_value())); + .inc_by(u64::try_from(num_bytes).unwrap_or(u64::MAX)); Poll::Ready(Ok(num_bytes)) } @@ -268,7 +268,7 @@ impl AsyncRead for InstrumentedStream { let num_bytes = ready!(this.inner.poll_read_vectored(cx, bufs))?; this.metrics .inbound - .inc_by(u64::try_from(num_bytes).unwrap_or(u64::max_value())); + .inc_by(u64::try_from(num_bytes).unwrap_or(u64::MAX)); Poll::Ready(Ok(num_bytes)) } } @@ -283,7 +283,7 @@ impl AsyncWrite for InstrumentedStream { let num_bytes = ready!(this.inner.poll_write(cx, buf))?; this.metrics .outbound - .inc_by(u64::try_from(num_bytes).unwrap_or(u64::max_value())); + .inc_by(u64::try_from(num_bytes).unwrap_or(u64::MAX)); Poll::Ready(Ok(num_bytes)) } @@ -296,7 +296,7 @@ impl AsyncWrite for InstrumentedStream { let num_bytes = ready!(this.inner.poll_write_vectored(cx, bufs))?; this.metrics .outbound - .inc_by(u64::try_from(num_bytes).unwrap_or(u64::max_value())); + .inc_by(u64::try_from(num_bytes).unwrap_or(u64::MAX)); Poll::Ready(Ok(num_bytes)) } diff --git a/misc/multistream-select/src/length_delimited.rs b/misc/multistream-select/src/length_delimited.rs index 6515d00c7176..3a7988d0548e 100644 --- a/misc/multistream-select/src/length_delimited.rs +++ b/misc/multistream-select/src/length_delimited.rs @@ -25,7 +25,6 @@ use std::{ io, pin::Pin, task::{Context, Poll}, - u16, }; const MAX_LEN_BYTES: u16 = 2; diff --git a/misc/quickcheck-ext/src/lib.rs b/misc/quickcheck-ext/src/lib.rs index a3b9ce26e6e0..4ada7e73ba1b 100644 --- a/misc/quickcheck-ext/src/lib.rs +++ b/misc/quickcheck-ext/src/lib.rs @@ -9,7 +9,7 @@ pub trait GenRange { fn gen_range(&mut self, _range: Range) -> T; fn gen_index(&mut self, ubound: usize) -> usize { - if ubound <= (core::u32::MAX as usize) { + if ubound <= (u32::MAX as usize) { self.gen_range(0..ubound as u32) as usize } else { self.gen_range(0..ubound) diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs index 459f769fb123..6eb2e42909a9 100644 --- a/protocols/kad/src/kbucket.rs +++ b/protocols/kad/src/kbucket.rs @@ -594,7 +594,7 @@ mod tests { assert!(!bucket_ref.contains(&Distance(min.0 - 1))); } - if max != Distance(U256::max_value()) { + if max != Distance(U256::MAX) { // ^ avoid overflow assert!(!bucket_ref.contains(&Distance(max.0 + 1))); } diff --git a/protocols/mdns/src/behaviour/iface/dns.rs b/protocols/mdns/src/behaviour/iface/dns.rs index 41ce9efa7147..39dbf08c731b 100644 --- a/protocols/mdns/src/behaviour/iface/dns.rs +++ b/protocols/mdns/src/behaviour/iface/dns.rs @@ -247,7 +247,7 @@ fn duration_to_secs(duration: Duration) -> u32 { let secs = duration .as_secs() .saturating_add(u64::from(duration.subsec_nanos() > 0)); - cmp::min(secs, From::from(u32::max_value())) as u32 + cmp::min(secs, From::from(u32::MAX)) as u32 } /// Appends a big-endian u32 to `out`. diff --git a/protocols/mdns/src/behaviour/timer.rs b/protocols/mdns/src/behaviour/timer.rs index 4f6ceec306da..5e2846546768 100644 --- a/protocols/mdns/src/behaviour/timer.rs +++ b/protocols/mdns/src/behaviour/timer.rs @@ -98,7 +98,7 @@ pub(crate) mod tokio { // Taken from: https://docs.rs/async-io/1.7.0/src/async_io/lib.rs.html#91 let mut inner = time::interval_at( TokioInstant::from_std(instant), - Duration::new(std::u64::MAX, 1_000_000_000 - 1), + Duration::new(u64::MAX, 1_000_000_000 - 1), ); inner.set_missed_tick_behavior(MissedTickBehavior::Skip); Self { inner } @@ -125,7 +125,7 @@ pub(crate) mod tokio { } fn size_hint(&self) -> (usize, Option) { - (std::usize::MAX, None) + (usize::MAX, None) } } } diff --git a/transports/websocket-websys/src/web_context.rs b/transports/websocket-websys/src/web_context.rs index 2b5d7b46431b..40efbb1d9b08 100644 --- a/transports/websocket-websys/src/web_context.rs +++ b/transports/websocket-websys/src/web_context.rs @@ -1,3 +1,6 @@ +// TODO: remove when https://github.com/rust-lang/rust-clippy/issues/12377 fix lands in stable clippy. +#![allow(clippy::empty_docs)] + use wasm_bindgen::prelude::*; use web_sys::window;