Merge branch 'master' into add-rusttoml

guillaumemichel · web-flow · commit 22432ab0dd8f · 2024-11-28T11:14:09.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -88,7 +88,7 @@ libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.1", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
 libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" }
-libp2p-noise = { version = "0.45.0", path = "transports/noise" }
+libp2p-noise = { version = "0.45.1", path = "transports/noise" }
 libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
 libp2p-ping = { version = "0.45.1", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.42.0", path = "transports/plaintext" }
@@ -111,7 +111,7 @@ libp2p-webrtc-utils = { version = "0.3.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.4.0-alpha.2", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.44.1", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.4.1", path = "transports/websocket-websys" }
-libp2p-webtransport-websys = { version = "0.4.0", path = "transports/webtransport-websys" }
+libp2p-webtransport-websys = { version = "0.4.1", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
 
 # External dependencies
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
@@ -18,10 +18,14 @@
 - Introduce back pressure and penalize slow peers. Drop stale messages that timeout before being
   delivered.
   See [PR 5595](https://github.com/libp2p/rust-libp2p/pull/5595).
+
 - Change `Behaviour::unsubscribe` and `Behaviour::report_message_validation_result`
   to `bool` they don't need to be a `Result`.
   See [PR 5595](https://github.com/libp2p/rust-libp2p/pull/5595).
 
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.47.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/gossipsub/src/backoff.rs b/protocols/gossipsub/src/backoff.rs
@@ -131,7 +131,7 @@ impl BackoffStorage {
     pub(crate) fn is_backoff_with_slack(&self, topic: &TopicHash, peer: &PeerId) -> bool {
         self.backoffs
             .get(topic)
-            .map_or(false, |m| m.contains_key(peer))
+            .is_some_and(|m| m.contains_key(peer))
     }
 
     pub(crate) fn get_backoff_time(&self, topic: &TopicHash, peer: &PeerId) -> Option<Instant> {
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
@@ -1716,7 +1716,7 @@ where
         let self_published = !self.config.allow_self_origin()
             && if let Some(own_id) = self.publish_config.get_own_id() {
                 own_id != propagation_source
-                    && raw_message.source.as_ref().map_or(false, |s| s == own_id)
+                    && raw_message.source.as_ref().is_some_and(|s| s == own_id)
             } else {
                 self.published_message_ids.contains(msg_id)
             };
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
@@ -6,6 +6,8 @@
   See [PR 5573](https://github.com/libp2p/rust-libp2p/pull/5573).
 - Add `Behavior::find_closest_local_peers()`.
   See [PR 5645](https://github.com/libp2p/rust-libp2p/pull/5645).
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
 
 ## 0.46.2
 
diff --git a/protocols/kad/src/jobs.rs b/protocols/kad/src/jobs.rs
@@ -208,7 +208,7 @@ impl PutRecordJob {
         T: RecordStore,
     {
         if self.inner.check_ready(cx, now) {
-            let publish = self.next_publish.map_or(false, |t_pub| now >= t_pub);
+            let publish = self.next_publish.is_some_and(|t_pub| now >= t_pub);
             let records = store
                 .records()
                 .filter_map(|r| {
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
@@ -531,12 +531,12 @@ where
 
     /// Returns true if the bucket has a pending node.
     pub fn has_pending(&self) -> bool {
-        self.bucket.pending().map_or(false, |n| !n.is_ready())
+        self.bucket.pending().is_some_and(|n| !n.is_ready())
     }
 
     /// Tests whether the given distance falls into this bucket.
     pub fn contains(&self, d: &Distance) -> bool {
-        BucketIndex::new(d).map_or(false, |i| i == self.index)
+        BucketIndex::new(d).is_some_and(|i| i == self.index)
     }
 
     /// Generates a random distance that falls into this bucket.
diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs
@@ -382,7 +382,7 @@ where
             // Adjust `first_connected_pos` accordingly.
             match status {
                 NodeStatus::Connected => {
-                    if self.first_connected_pos.map_or(false, |p| p == pos.0)
+                    if self.first_connected_pos.is_some_and(|p| p == pos.0)
                         && pos.0 == self.nodes.len()
                     {
                         // It was the last connected node.
@@ -403,7 +403,7 @@ where
 
     /// Returns the status of the node at the given position.
     pub(crate) fn status(&self, pos: Position) -> NodeStatus {
-        if self.first_connected_pos.map_or(false, |i| pos.0 >= i) {
+        if self.first_connected_pos.is_some_and(|i| pos.0 >= i) {
             NodeStatus::Connected
         } else {
             NodeStatus::Disconnected
diff --git a/protocols/kad/src/record.rs b/protocols/kad/src/record.rs
@@ -104,7 +104,7 @@ impl Record {
 
     /// Checks whether the record is expired w.r.t. the given `Instant`.
     pub fn is_expired(&self, now: Instant) -> bool {
-        self.expires.map_or(false, |t| now >= t)
+        self.expires.is_some_and(|t| now >= t)
     }
 }
 
@@ -158,7 +158,7 @@ impl ProviderRecord {
     /// Checks whether the provider record is expired w.r.t. the given
     /// `Instant`.
     pub fn is_expired(&self, now: Instant) -> bool {
-        self.expires.map_or(false, |t| now >= t)
+        self.expires.is_some_and(|t| now >= t)
     }
 }
 
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
@@ -5,6 +5,9 @@
 
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+  
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
 
 ## 0.45.1
 
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
@@ -213,7 +213,7 @@ struct PendingConnection {
 
 impl PendingConnection {
     fn is_for_same_remote_as(&self, other: PeerId) -> bool {
-        self.peer_id.map_or(false, |peer| peer == other)
+        self.peer_id == Some(other)
     }
 
     /// Aborts the connection attempt, closing the connection.
diff --git a/transports/noise/CHANGELOG.md b/transports/noise/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.1
+
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.45.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-noise"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Cryptographic handshake protocol using the noise framework."
-version = "0.45.0"
+version = "0.45.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/transports/noise/src/io/handshake.rs b/transports/noise/src/io/handshake.rs
@@ -108,7 +108,7 @@ where
             .id_remote_pubkey
             .ok_or_else(|| Error::AuthenticationFailed)?;
 
-        let is_valid_signature = self.dh_remote_pubkey_sig.as_ref().map_or(false, |s| {
+        let is_valid_signature = self.dh_remote_pubkey_sig.as_ref().is_some_and(|s| {
             id_pk.verify(&[STATIC_KEY_DOMAIN.as_bytes(), pubkey.as_ref()].concat(), s)
         });
 
diff --git a/transports/websocket-websys/CHANGELOG.md b/transports/websocket-websys/CHANGELOG.md
@@ -3,6 +3,9 @@
 - fix: Return `None` when extracting a `/dnsaddr` address
   See [PR 5613](https://github.com/libp2p/rust-libp2p/pull/5613)
 
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.4.0
 
 - Implement refactored `Transport`.
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
@@ -20,6 +20,8 @@
 
 //! Libp2p websocket transports built on [web-sys](https://rustwasm.github.io/wasm-bindgen/web-sys/index.html).
 
+#![allow(unexpected_cfgs)]
+
 mod web_context;
 
 use std::{
diff --git a/transports/webtransport-websys/CHANGELOG.md b/transports/webtransport-websys/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.1
+
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.4.0
 
 - Implement refactored `Transport`.
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-webtransport-websys"
 edition = "2021"
 rust-version = { workspace = true }
 description = "WebTransport for libp2p under WASM environment"
-version = "0.4.0"
+version = "0.4.1"
 authors = [
     "Yiannis Marangos <yiannis@eiger.co>",
     "oblique <psyberbits@gmail.com>",
diff --git a/transports/webtransport-websys/src/lib.rs b/transports/webtransport-websys/src/lib.rs
@@ -1,5 +1,7 @@
 //! Libp2p WebTransport built on [web-sys](https://rustwasm.github.io/wasm-bindgen/web-sys/index.html)
 
+#![allow(unexpected_cfgs)]
+
 mod bindings;
 mod connection;
 mod endpoint;
diff --git a/wasm-tests/webtransport-tests/src/lib.rs b/wasm-tests/webtransport-tests/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(unexpected_cfgs)]
+
 use std::{future::poll_fn, pin::Pin};
 
 use futures::{channel::oneshot, AsyncReadExt, AsyncWriteExt};

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ impl BackoffStorage {`
`131`	`131`	`pub(crate) fn is_backoff_with_slack(&self, topic: &TopicHash, peer: &PeerId) -> bool {`
`132`	`132`	`self.backoffs`
`133`	`133`	`.get(topic)`
`134`		`- .map_or(false, \|m\| m.contains_key(peer))`
	`134`	`+ .is_some_and(\|m\| m.contains_key(peer))`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`pub(crate) fn get_backoff_time(&self, topic: &TopicHash, peer: &PeerId) -> Option<Instant> {`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ impl PutRecordJob {`
`208`	`208`	`T: RecordStore,`
`209`	`209`	`{`
`210`	`210`	`if self.inner.check_ready(cx, now) {`
`211`		`- let publish = self.next_publish.map_or(false, \|t_pub\| now >= t_pub);`
	`211`	`+ let publish = self.next_publish.is_some_and(\|t_pub\| now >= t_pub);`
`212`	`212`	`let records = store`
`213`	`213`	`.records()`
`214`	`214`	`.filter_map(\|r\| {`
Original file line number	Diff line number	Diff line change
`@@ -531,12 +531,12 @@ where`
`531`	`531`
`532`	`532`	`/// Returns true if the bucket has a pending node.`
`533`	`533`	`pub fn has_pending(&self) -> bool {`
`534`		`- self.bucket.pending().map_or(false, \|n\| !n.is_ready())`
	`534`	`+ self.bucket.pending().is_some_and(\|n\| !n.is_ready())`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`/// Tests whether the given distance falls into this bucket.`
`538`	`538`	`pub fn contains(&self, d: &Distance) -> bool {`
`539`		`- BucketIndex::new(d).map_or(false, \|i\| i == self.index)`
	`539`	`+ BucketIndex::new(d).is_some_and(\|i\| i == self.index)`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`/// Generates a random distance that falls into this bucket.`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ impl Record {`
`104`	`104`
`105`	`105`	/// Checks whether the record is expired w.r.t. the given `Instant`.
`106`	`106`	`pub fn is_expired(&self, now: Instant) -> bool {`
`107`		`- self.expires.map_or(false, \|t\| now >= t)`
	`107`	`+ self.expires.is_some_and(\|t\| now >= t)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`@@ -158,7 +158,7 @@ impl ProviderRecord {`
`158`	`158`	`/// Checks whether the provider record is expired w.r.t. the given`
`159`	`159`	/// `Instant`.
`160`	`160`	`pub fn is_expired(&self, now: Instant) -> bool {`
`161`		`- self.expires.map_or(false, \|t\| now >= t)`
	`161`	`+ self.expires.is_some_and(\|t\| now >= t)`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`