chore(ci): address clippy beta lints (#5649)

jxs · dariusc93 · web-flow · commit 4e7ff3ebf273 · 2024-10-26T19:10:25.000Z
Co-authored-by: Darius Clark &lt;dariusc93@users.noreply.github.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/identity/src/peer_id.rs b/identity/src/peer_id.rs
@@ -191,7 +191,7 @@ impl<'de> Deserialize<'de> for PeerId {
 
         struct PeerIdVisitor;
 
-        impl<'de> Visitor<'de> for PeerIdVisitor {
+        impl Visitor<'_> for PeerIdVisitor {
             type Value = PeerId;
 
             fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
diff --git a/identity/src/rsa.rs b/identity/src/rsa.rs
@@ -149,7 +149,7 @@ struct Asn1RawOid<'a> {
     object: DerObject<'a>,
 }
 
-impl<'a> Asn1RawOid<'a> {
+impl Asn1RawOid<'_> {
     /// The underlying OID as byte literal.
     pub(crate) fn oid(&self) -> &[u8] {
         self.object.value()
@@ -169,7 +169,7 @@ impl<'a> DerTypeView<'a> for Asn1RawOid<'a> {
     }
 }
 
-impl<'a> DerEncodable for Asn1RawOid<'a> {
+impl DerEncodable for Asn1RawOid<'_> {
     fn encode<S: Sink>(&self, sink: &mut S) -> Result<(), Asn1DerError> {
         self.object.encode(sink)
     }
diff --git a/misc/quick-protobuf-codec/src/lib.rs b/misc/quick-protobuf-codec/src/lib.rs
@@ -120,7 +120,7 @@ impl<'a> BytesMutWriterBackend<'a> {
     }
 }
 
-impl<'a> WriterBackend for BytesMutWriterBackend<'a> {
+impl WriterBackend for BytesMutWriterBackend<'_> {
     fn pb_write_u8(&mut self, x: u8) -> quick_protobuf::Result<()> {
         self.dst.put_u8(x);
 
diff --git a/muxers/test-harness/src/lib.rs b/muxers/test-harness/src/lib.rs
@@ -206,7 +206,7 @@ enum Event {
     ProtocolComplete,
 }
 
-impl<'m, M> Stream for Harness<'m, M>
+impl<M> Stream for Harness<'_, M>
 where
     M: StreamMuxer + Unpin,
 {
diff --git a/protocols/autonat/src/v1/behaviour/as_client.rs b/protocols/autonat/src/v1/behaviour/as_client.rs
@@ -98,7 +98,7 @@ pub(crate) struct AsClient<'a> {
     pub(crate) other_candidates: &'a HashSet<Multiaddr>,
 }
 
-impl<'a> HandleInnerEvent for AsClient<'a> {
+impl HandleInnerEvent for AsClient<'_> {
     fn handle_event(
         &mut self,
         event: request_response::Event<DialRequest, DialResponse>,
@@ -179,7 +179,7 @@ impl<'a> HandleInnerEvent for AsClient<'a> {
     }
 }
 
-impl<'a> AsClient<'a> {
+impl AsClient<'_> {
     pub(crate) fn poll_auto_probe(&mut self, cx: &mut Context<'_>) -> Poll<OutboundProbeEvent> {
         match self.schedule_probe.poll_unpin(cx) {
             Poll::Ready(()) => {
diff --git a/protocols/autonat/src/v1/behaviour/as_server.rs b/protocols/autonat/src/v1/behaviour/as_server.rs
@@ -91,7 +91,7 @@ pub(crate) struct AsServer<'a> {
     >,
 }
 
-impl<'a> HandleInnerEvent for AsServer<'a> {
+impl HandleInnerEvent for AsServer<'_> {
     fn handle_event(
         &mut self,
         event: request_response::Event<DialRequest, DialResponse>,
@@ -208,7 +208,7 @@ impl<'a> HandleInnerEvent for AsServer<'a> {
     }
 }
 
-impl<'a> AsServer<'a> {
+impl AsServer<'_> {
     pub(crate) fn on_outbound_connection(
         &mut self,
         peer: &PeerId,
diff --git a/protocols/gossipsub/src/backoff.rs b/protocols/gossipsub/src/backoff.rs
@@ -48,8 +48,7 @@ pub(crate) struct BackoffStorage {
 
 impl BackoffStorage {
     fn heartbeats(d: &Duration, heartbeat_interval: &Duration) -> usize {
-        ((d.as_nanos() + heartbeat_interval.as_nanos() - 1) / heartbeat_interval.as_nanos())
-            as usize
+        d.as_nanos().div_ceil(heartbeat_interval.as_nanos()) as usize
     }
 
     pub(crate) fn new(
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
@@ -3361,7 +3361,7 @@ pub struct QueryMut<'a> {
     query: &'a mut Query,
 }
 
-impl<'a> QueryMut<'a> {
+impl QueryMut<'_> {
     pub fn id(&self) -> QueryId {
         self.query.id()
     }
@@ -3391,7 +3391,7 @@ pub struct QueryRef<'a> {
     query: &'a Query,
 }
 
-impl<'a> QueryRef<'a> {
+impl QueryRef<'_> {
     pub fn id(&self) -> QueryId {
         self.query.id()
     }
diff --git a/protocols/ping/src/protocol.rs b/protocols/ping/src/protocol.rs
@@ -44,7 +44,6 @@ pub const PROTOCOL_NAME: StreamProtocol = StreamProtocol::new("/ipfs/ping/1.0.0"
 /// >           Nagle's algorithm, delayed acks and similar configuration options
 /// >           which can affect latencies especially on otherwise low-volume
 /// >           connections.
-
 const PING_SIZE: usize = 32;
 
 /// Sends a ping and waits for the pong.
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
@@ -516,7 +516,7 @@ pub(crate) struct IncomingInfo<'a> {
     pub(crate) send_back_addr: &'a Multiaddr,
 }
 
-impl<'a> IncomingInfo<'a> {
+impl IncomingInfo<'_> {
     /// Builds the [`ConnectedPoint`] corresponding to the incoming connection.
     pub(crate) fn create_connected_point(&self) -> ConnectedPoint {
         ConnectedPoint::Listener {
diff --git a/swarm/src/handler.rs b/swarm/src/handler.rs
@@ -226,7 +226,7 @@ pub enum ConnectionEvent<'a, IP: InboundUpgradeSend, OP: OutboundUpgradeSend, IO
     RemoteProtocolsChange(ProtocolsChange<'a>),
 }
 
-impl<'a, IP, OP, IOI, OOI> fmt::Debug for ConnectionEvent<'a, IP, OP, IOI, OOI>
+impl<IP, OP, IOI, OOI> fmt::Debug for ConnectionEvent<'_, IP, OP, IOI, OOI>
 where
     IP: InboundUpgradeSend + fmt::Debug,
     IP::Output: fmt::Debug,
@@ -262,8 +262,8 @@ where
     }
 }
 
-impl<'a, IP: InboundUpgradeSend, OP: OutboundUpgradeSend, IOI, OOI>
-    ConnectionEvent<'a, IP, OP, IOI, OOI>
+impl<IP: InboundUpgradeSend, OP: OutboundUpgradeSend, IOI, OOI>
+    ConnectionEvent<'_, IP, OP, IOI, OOI>
 {
     /// Whether the event concerns an outbound stream.
     pub fn is_outbound(&self) -> bool {
diff --git a/transports/noise/src/io/handshake.rs b/transports/noise/src/io/handshake.rs
@@ -73,7 +73,6 @@ where
     /// will be sent and received on the given I/O resource and using the
     /// provided session for cryptographic operations according to the chosen
     /// Noise handshake pattern.
-
     pub(crate) fn new(
         io: T,
         session: snow::HandshakeState,
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
@@ -96,8 +96,8 @@ impl libp2p_core::Transport for Transport {
             return Err(TransportError::MultiaddrNotSupported(addr));
         }
 
-        let url = extract_websocket_url(&addr)
-            .ok_or_else(|| TransportError::MultiaddrNotSupported(addr))?;
+        let url =
+            extract_websocket_url(&addr).ok_or(TransportError::MultiaddrNotSupported(addr))?;
 
         Ok(async move {
             let socket = match WebSocket::new(&url) {
diff --git a/transports/websocket/src/framed.rs b/transports/websocket/src/framed.rs
@@ -442,7 +442,7 @@ pub(crate) enum WsListenProto<'a> {
     TlsWs(Cow<'a, str>),
 }
 
-impl<'a> WsListenProto<'a> {
+impl WsListenProto<'_> {
     pub(crate) fn append_on_addr(&self, addr: &mut Multiaddr) {
         match self {
             WsListenProto::Ws(path) => {
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
@@ -21,6 +21,7 @@ libp2p-identity = { workspace = true }
 libp2p-noise = { workspace = true }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
+once_cell = "1.19.0"
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 thiserror = "1.0.61"
 tracing = { workspace = true }
diff --git a/transports/webtransport-websys/src/utils.rs b/transports/webtransport-websys/src/utils.rs
@@ -1,10 +1,17 @@
 use js_sys::{Promise, Reflect};
+use once_cell::sync::Lazy;
 use send_wrapper::SendWrapper;
 use std::io;
 use wasm_bindgen::{JsCast, JsValue};
 
 use crate::Error;
 
+type Closure = wasm_bindgen::closure::Closure<dyn FnMut(JsValue)>;
+static DO_NOTHING: Lazy<SendWrapper<Closure>> = Lazy::new(|| {
+    let cb = Closure::new(|_| {});
+    SendWrapper::new(cb)
+});
+
 /// Properly detach a promise.
 ///
 /// A promise always runs in the background, however if you don't await it,
@@ -13,22 +20,9 @@ use crate::Error;
 //
 // Ref: https://github.com/typescript-eslint/typescript-eslint/blob/391a6702c0a9b5b3874a7a27047f2a721f090fb6/packages/eslint-plugin/docs/rules/no-floating-promises.md
 pub(crate) fn detach_promise(promise: Promise) {
-    type Closure = wasm_bindgen::closure::Closure<dyn FnMut(JsValue)>;
-    static mut DO_NOTHING: Option<SendWrapper<Closure>> = None;
-
-    // Allocate Closure only once and reuse it
-    let do_nothing = unsafe {
-        if DO_NOTHING.is_none() {
-            let cb = Closure::new(|_| {});
-            DO_NOTHING = Some(SendWrapper::new(cb));
-        }
-
-        DO_NOTHING.as_deref().unwrap()
-    };
-
     // Avoid having "floating" promise and ignore any errors.
     // After `catch` promise is allowed to be dropped.
-    let _ = promise.catch(do_nothing);
+    let _ = promise.catch(&DO_NOTHING);
 }
 
 /// Typecasts a JavaScript type.

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ struct Asn1RawOid<'a> {`
`149`	`149`	`object: DerObject<'a>,`
`150`	`150`	`}`
`151`	`151`
`152`		`-impl<'a> Asn1RawOid<'a> {`
	`152`	`+impl Asn1RawOid<'_> {`
`153`	`153`	`/// The underlying OID as byte literal.`
`154`	`154`	`pub(crate) fn oid(&self) -> &[u8] {`
`155`	`155`	`self.object.value()`
`@@ -169,7 +169,7 @@ impl<'a> DerTypeView<'a> for Asn1RawOid<'a> {`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`172`		`-impl<'a> DerEncodable for Asn1RawOid<'a> {`
	`172`	`+impl DerEncodable for Asn1RawOid<'_> {`
`173`	`173`	`fn encode<S: Sink>(&self, sink: &mut S) -> Result<(), Asn1DerError> {`
`174`	`174`	`self.object.encode(sink)`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ impl<'a> BytesMutWriterBackend<'a> {`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`-impl<'a> WriterBackend for BytesMutWriterBackend<'a> {`
	`123`	`+impl WriterBackend for BytesMutWriterBackend<'_> {`
`124`	`124`	`fn pb_write_u8(&mut self, x: u8) -> quick_protobuf::Result<()> {`
`125`	`125`	`self.dst.put_u8(x);`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ enum Event {`
`206`	`206`	`ProtocolComplete,`
`207`	`207`	`}`
`208`	`208`
`209`		`-impl<'m, M> Stream for Harness<'m, M>`
	`209`	`+impl<M> Stream for Harness<'_, M>`
`210`	`210`	`where`
`211`	`211`	`M: StreamMuxer + Unpin,`
`212`	`212`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ pub(crate) struct AsClient<'a> {`
`98`	`98`	`pub(crate) other_candidates: &'a HashSet<Multiaddr>,`
`99`	`99`	`}`
`100`	`100`
`101`		`-impl<'a> HandleInnerEvent for AsClient<'a> {`
	`101`	`+impl HandleInnerEvent for AsClient<'_> {`
`102`	`102`	`fn handle_event(`
`103`	`103`	`&mut self,`
`104`	`104`	`event: request_response::Event<DialRequest, DialResponse>,`
`@@ -179,7 +179,7 @@ impl<'a> HandleInnerEvent for AsClient<'a> {`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
`182`		`-impl<'a> AsClient<'a> {`
	`182`	`+impl AsClient<'_> {`
`183`	`183`	`pub(crate) fn poll_auto_probe(&mut self, cx: &mut Context<'_>) -> Poll<OutboundProbeEvent> {`
`184`	`184`	`match self.schedule_probe.poll_unpin(cx) {`
`185`	`185`	`Poll::Ready(()) => {`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ pub(crate) struct AsServer<'a> {`
`91`	`91`	`>,`
`92`	`92`	`}`
`93`	`93`
`94`		`-impl<'a> HandleInnerEvent for AsServer<'a> {`
	`94`	`+impl HandleInnerEvent for AsServer<'_> {`
`95`	`95`	`fn handle_event(`
`96`	`96`	`&mut self,`
`97`	`97`	`event: request_response::Event<DialRequest, DialResponse>,`
`@@ -208,7 +208,7 @@ impl<'a> HandleInnerEvent for AsServer<'a> {`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`211`		`-impl<'a> AsServer<'a> {`
	`211`	`+impl AsServer<'_> {`
`212`	`212`	`pub(crate) fn on_outbound_connection(`
`213`	`213`	`&mut self,`
`214`	`214`	`peer: &PeerId,`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ pub(crate) struct BackoffStorage {`
`48`	`48`
`49`	`49`	`impl BackoffStorage {`
`50`	`50`	`fn heartbeats(d: &Duration, heartbeat_interval: &Duration) -> usize {`
`51`		`- ((d.as_nanos() + heartbeat_interval.as_nanos() - 1) / heartbeat_interval.as_nanos())`
`52`		`- as usize`
	`51`	`+ d.as_nanos().div_ceil(heartbeat_interval.as_nanos()) as usize`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`pub(crate) fn new(`
Original file line number	Diff line number	Diff line change
`@@ -3361,7 +3361,7 @@ pub struct QueryMut<'a> {`
`3361`	`3361`	`query: &'a mut Query,`
`3362`	`3362`	`}`
`3363`	`3363`
`3364`		`-impl<'a> QueryMut<'a> {`
	`3364`	`+impl QueryMut<'_> {`
`3365`	`3365`	`pub fn id(&self) -> QueryId {`
`3366`	`3366`	`self.query.id()`
`3367`	`3367`	`}`
`@@ -3391,7 +3391,7 @@ pub struct QueryRef<'a> {`
`3391`	`3391`	`query: &'a Query,`
`3392`	`3392`	`}`
`3393`	`3393`
`3394`		`-impl<'a> QueryRef<'a> {`
	`3394`	`+impl QueryRef<'_> {`
`3395`	`3395`	`pub fn id(&self) -> QueryId {`
`3396`	`3396`	`self.query.id()`
`3397`	`3397`	`}`