refactor: replace the once_cell dependency with std equivalents

FalkWoldmann · web-flow · commit b685b63dc6b9 · 2025-03-11T03:42:19.000Z
Pull-Request: #5913.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -78,7 +78,7 @@ libp2p = { version = "0.55.1", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.5.0", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.14.1", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.5.1", path = "misc/connection-limits" }
-libp2p-core = { version = "0.43.0", path = "core" }
+libp2p-core = { version = "0.43.1", path = "core" }
 libp2p-dcutr = { version = "0.13.0", path = "protocols/dcutr" }
 libp2p-dns = { version = "0.43.0", path = "transports/dns" }
 libp2p-floodsub = { version = "0.46.1", path = "protocols/floodsub" }
@@ -90,7 +90,7 @@ libp2p-mdns = { version = "0.47.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.4.0", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.16.1", path = "misc/metrics" }
 libp2p-mplex = { version = "0.43.1", path = "muxers/mplex" }
-libp2p-noise = { version = "0.46.0", path = "transports/noise" }
+libp2p-noise = { version = "0.46.1", path = "transports/noise" }
 libp2p-peer-store = { version = "0.1.0", path = "misc/peer-store" }
 libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
 libp2p-ping = { version = "0.46.0", path = "protocols/ping" }
@@ -114,7 +114,7 @@ libp2p-webrtc-utils = { version = "0.4.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.4.0", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.45.1", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.5.0", path = "transports/websocket-websys" }
-libp2p-webtransport-websys = { version = "0.5.0", path = "transports/webtransport-websys" }
+libp2p-webtransport-websys = { version = "0.5.1", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.47.0", path = "muxers/yamux" }
 
 # External dependencies
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.43.1
+- Remove `once_cell` dependency.
+  See [PR 5913](https://github.com/libp2p/rust-libp2p/pull/5913)
+
 ## 0.43.0
 
 - Added `libp2p::core::util::unreachable` that is a drop-in replacement of `void::unreachable`.
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-core"
 edition.workspace = true
 rust-version = { workspace = true }
 description = "Core traits and structs of libp2p"
-version = "0.43.0"
+version = "0.43.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -20,7 +20,6 @@ libp2p-identity = { workspace = true, features = ["peerid", "ed25519"] }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
 multistream-select = { workspace = true }
-once_cell = "1.19.0"
 parking_lot = "0.12.3"
 pin-project = "1.1.5"
 quick-protobuf = "0.8"
diff --git a/core/src/transport/memory.rs b/core/src/transport/memory.rs
@@ -23,6 +23,7 @@ use std::{
     error, fmt, io,
     num::NonZeroU64,
     pin::Pin,
+    sync::LazyLock,
 };
 
 use fnv::FnvHashMap;
@@ -33,13 +34,12 @@ use futures::{
     task::{Context, Poll},
 };
 use multiaddr::{Multiaddr, Protocol};
-use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 use rw_stream_sink::RwStreamSink;
 
 use crate::transport::{DialOpts, ListenerId, Transport, TransportError, TransportEvent};
 
-static HUB: Lazy<Hub> = Lazy::new(|| Hub(Mutex::new(FnvHashMap::default())));
+static HUB: LazyLock<Hub> = LazyLock::new(|| Hub(Mutex::new(FnvHashMap::default())));
 
 struct Hub(Mutex<FnvHashMap<NonZeroU64, ChannelSender>>);
 
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
@@ -1,4 +1,7 @@
 ## 0.47.0
+- Remove `once_cell` dependency.
+  See [PR 5913](https://github.com/libp2p/rust-libp2p/pull/5913)
+
 - Separate the `PendingConnectionError` into two parts `PendingOutboundConnectionError` and `PendingInboundConnectionError` to have better control over error handling. See [PR](https://github.com/libp2p/rust-libp2p/pull/5861)
 
 - Undo `ConnectionHandler::{InboundOpenInfo, OutboundOpenInfo}` deprecation.
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
@@ -22,7 +22,6 @@ libp2p-identity = { workspace = true }
 libp2p-swarm-derive = { workspace = true, optional = true }
 lru = "0.12.3"
 multistream-select = { workspace = true }
-once_cell = "1.19.0"
 rand = "0.8"
 smallvec = "1.13.2"
 tracing = { workspace = true }
@@ -52,7 +51,6 @@ libp2p-swarm-test = { path = "../swarm-test" }                      # Using `pat
 libp2p-yamux = { path = "../muxers/yamux" }                         # Using `path` here because this is a cyclic dev-dependency which otherwise breaks releasing.
 quickcheck = { workspace = true }
 criterion = { version = "0.5", features = ["async_tokio"] }
-once_cell = "1.19.0"
 trybuild = "1.0.95"
 tokio = { workspace = true, features = ["time", "rt", "macros", "rt-multi-thread"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
diff --git a/swarm/src/behaviour/external_addresses.rs b/swarm/src/behaviour/external_addresses.rs
@@ -87,8 +87,9 @@ impl ExternalAddresses {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::LazyLock;
+
     use libp2p_core::multiaddr::Protocol;
-    use once_cell::sync::Lazy;
     use rand::Rng;
 
     use super::*;
@@ -179,8 +180,8 @@ mod tests {
         })
     }
 
-    static MEMORY_ADDR_1000: Lazy<Multiaddr> =
-        Lazy::new(|| Multiaddr::empty().with(Protocol::Memory(1000)));
-    static MEMORY_ADDR_2000: Lazy<Multiaddr> =
-        Lazy::new(|| Multiaddr::empty().with(Protocol::Memory(2000)));
+    static MEMORY_ADDR_1000: LazyLock<Multiaddr> =
+        LazyLock::new(|| Multiaddr::empty().with(Protocol::Memory(1000)));
+    static MEMORY_ADDR_2000: LazyLock<Multiaddr> =
+        LazyLock::new(|| Multiaddr::empty().with(Protocol::Memory(2000)));
 }
diff --git a/swarm/src/behaviour/listen_addresses.rs b/swarm/src/behaviour/listen_addresses.rs
@@ -35,7 +35,6 @@ impl ListenAddresses {
 #[cfg(test)]
 mod tests {
     use libp2p_core::{multiaddr::Protocol, transport::ListenerId};
-    use once_cell::sync::Lazy;
 
     use super::*;
 
@@ -76,6 +75,6 @@ mod tests {
         })
     }
 
-    static MEMORY_ADDR: Lazy<Multiaddr> =
-        Lazy::new(|| Multiaddr::empty().with(Protocol::Memory(1000)));
+    static MEMORY_ADDR: std::sync::LazyLock<Multiaddr> =
+        std::sync::LazyLock::new(|| Multiaddr::empty().with(Protocol::Memory(1000)));
 }
diff --git a/swarm/src/behaviour/peer_addresses.rs b/swarm/src/behaviour/peer_addresses.rs
@@ -95,13 +95,12 @@ impl Default for PeerAddresses {
 
 #[cfg(test)]
 mod tests {
-    use std::io;
+    use std::{io, sync::LazyLock};
 
     use libp2p_core::{
         multiaddr::Protocol,
         transport::{memory::MemoryTransportError, TransportError},
     };
-    use once_cell::sync::Lazy;
 
     use super::*;
     use crate::ConnectionId;
@@ -328,8 +327,8 @@ mod tests {
         errors
     }
 
-    static MEMORY_ADDR_1000: Lazy<Multiaddr> =
-        Lazy::new(|| Multiaddr::empty().with(Protocol::Memory(1000)));
-    static MEMORY_ADDR_2000: Lazy<Multiaddr> =
-        Lazy::new(|| Multiaddr::empty().with(Protocol::Memory(2000)));
+    static MEMORY_ADDR_1000: LazyLock<Multiaddr> =
+        LazyLock::new(|| Multiaddr::empty().with(Protocol::Memory(1000)));
+    static MEMORY_ADDR_2000: LazyLock<Multiaddr> =
+        LazyLock::new(|| Multiaddr::empty().with(Protocol::Memory(2000)));
 }
diff --git a/transports/noise/CHANGELOG.md b/transports/noise/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.46.1
+- Remove `once_cell` dependency.
+  See [PR 5913](https://github.com/libp2p/rust-libp2p/pull/5913)
+
 ## 0.46.0
 
 - Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-noise"
 edition.workspace = true
 rust-version = { workspace = true }
 description = "Cryptographic handshake protocol using the noise framework."
-version = "0.46.0"
+version = "0.46.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -16,7 +16,6 @@ libp2p-core = { workspace = true }
 libp2p-identity = { workspace = true, features = ["ed25519"] }
 multiaddr = { workspace = true }
 multihash = { workspace = true }
-once_cell = "1.19.0"
 quick-protobuf = "0.8"
 rand = "0.8.3"
 static_assertions = "1"
diff --git a/transports/noise/src/protocol.rs b/transports/noise/src/protocol.rs
@@ -20,8 +20,9 @@
 
 //! Components of a Noise protocol.
 
+use std::sync::LazyLock;
+
 use libp2p_identity as identity;
-use once_cell::sync::Lazy;
 use rand::{Rng as _, SeedableRng};
 use snow::params::NoiseParams;
 use x25519_dalek::{x25519, X25519_BASEPOINT_BYTES};
@@ -32,7 +33,7 @@ use crate::Error;
 /// Prefix of static key signatures for domain separation.
 pub(crate) const STATIC_KEY_DOMAIN: &str = "noise-libp2p-static-key:";
 
-pub(crate) static PARAMS_XX: Lazy<NoiseParams> = Lazy::new(|| {
+pub(crate) static PARAMS_XX: LazyLock<NoiseParams> = LazyLock::new(|| {
     "Noise_XX_25519_ChaChaPoly_SHA256"
         .parse()
         .expect("Invalid protocol name")
@@ -292,6 +293,8 @@ impl snow::types::Dh for Keypair {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::LazyLock;
+
     use super::*;
 
     #[test]
@@ -321,5 +324,5 @@ mod tests {
     }
 
     // Hack to work around borrow-checker.
-    static TEST_KEY: Lazy<Keypair> = Lazy::new(Keypair::new);
+    static TEST_KEY: LazyLock<Keypair> = LazyLock::new(Keypair::new);
 }
diff --git a/transports/webtransport-websys/CHANGELOG.md b/transports/webtransport-websys/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.1
+
+- Remove `once_cell` dependency.
+  See [PR 5913](https://github.com/libp2p/rust-libp2p/pull/5913)
+
 ## 0.5.0
 
 - Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-webtransport-websys"
 edition.workspace = true
 rust-version = { workspace = true }
 description = "WebTransport for libp2p under WASM environment"
-version = "0.5.0"
+version = "0.5.1"
 authors = [
     "Yiannis Marangos <yiannis@eiger.co>",
     "oblique <psyberbits@gmail.com>",
@@ -21,7 +21,6 @@ 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 = { workspace = true }
 tracing = { workspace = true }
diff --git a/transports/webtransport-websys/src/utils.rs b/transports/webtransport-websys/src/utils.rs
@@ -1,14 +1,13 @@
-use std::io;
+use std::{io, sync::LazyLock};
 
 use js_sys::{Promise, Reflect};
-use once_cell::sync::Lazy;
 use send_wrapper::SendWrapper;
 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(|| {
+static DO_NOTHING: LazyLock<SendWrapper<Closure>> = LazyLock::new(|| {
     let cb = Closure::new(|_| {});
     SendWrapper::new(cb)
 });

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ impl ListenAddresses {`
`35`	`35`	`#[cfg(test)]`
`36`	`36`	`mod tests {`
`37`	`37`	`use libp2p_core::{multiaddr::Protocol, transport::ListenerId};`
`38`		`- use once_cell::sync::Lazy;`
`39`	`38`
`40`	`39`	`use super::*;`
`41`	`40`
`@@ -76,6 +75,6 @@ mod tests {`
`76`	`75`	`})`
`77`	`76`	`}`
`78`	`77`
`79`		`- static MEMORY_ADDR: Lazy<Multiaddr> =`
`80`		`- Lazy::new(\|\| Multiaddr::empty().with(Protocol::Memory(1000)));`
	`78`	`+ static MEMORY_ADDR: std::sync::LazyLock<Multiaddr> =`
	`79`	`+ std::sync::LazyLock::new(\|\| Multiaddr::empty().with(Protocol::Memory(1000)));`
`81`	`80`	`}`