chore(tcp): remove async_std support

gitToki · web-flow · commit f47e38e0a157 · 2025-06-24T20:12:43.000Z
Pull-Request: #5955.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -105,7 +105,7 @@ libp2p-stream = { version = "0.3.0-alpha.1", path = "protocols/stream" }
 libp2p-swarm = { version = "0.47.0", path = "swarm" }
 libp2p-swarm-derive = { version = "=0.35.1", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required.
 libp2p-swarm-test = { version = "0.6.0", path = "swarm-test" }
-libp2p-tcp = { version = "0.43.0", path = "transports/tcp" }
+libp2p-tcp = { version = "0.44.0", path = "transports/tcp" }
 libp2p-tls = { version = "0.6.2", path = "transports/tls" }
 libp2p-uds = { version = "0.42.0", path = "transports/uds" }
 libp2p-upnp = { version = "0.4.1", path = "protocols/upnp" }
diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
@@ -13,6 +13,9 @@
 - Make the `*-websys` variants (`libp2p-webrtc-websys`, `libp2p-websocket-websys`, `libp2p-webtransport-websys`) only available on wasm32 target architecture.
   See [PR 5891](https://github.com/libp2p/rust-libp2p/pull/5891).
 
+- Remove TCP from the `async-std` swarm builder, as `async-std` support was removed from `libp2p-tcp` transport.
+  See [PR 5955](https://github.com/libp2p/rust-libp2p/pull/5955)
+
 - Remove QUIC from the `async-std` swarm builder, as `async-std` support was removed from `libp2p-quic` transport.
   See [PR 5954](https://github.com/libp2p/rust-libp2p/pull/5954)
 
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
@@ -53,7 +53,7 @@ full = [
     "upnp",
 ]
 
-async-std = ["libp2p-swarm/async-std", "libp2p-tcp?/async-io"]
+async-std = ["libp2p-swarm/async-std"]
 autonat = ["dep:libp2p-autonat"]
 cbor = ["libp2p-request-response?/cbor"]
 dcutr = ["dep:libp2p-dcutr", "libp2p-metrics?/dcutr"]
diff --git a/libp2p/src/builder.rs b/libp2p/src/builder.rs
@@ -102,28 +102,6 @@ mod tests {
             .build();
     }
 
-    #[test]
-    #[cfg(all(
-        feature = "async-std",
-        feature = "tcp",
-        feature = "tls",
-        feature = "noise",
-        feature = "yamux",
-    ))]
-    fn async_std_tcp() {
-        let _ = SwarmBuilder::with_new_identity()
-            .with_async_std()
-            .with_tcp(
-                Default::default(),
-                libp2p_tls::Config::new,
-                libp2p_yamux::Config::default,
-            )
-            .unwrap()
-            .with_behaviour(|_| libp2p_swarm::dummy::Behaviour)
-            .unwrap()
-            .build();
-    }
-
     #[test]
     #[cfg(all(feature = "tokio", feature = "quic"))]
     fn quic() {
diff --git a/libp2p/src/builder/phase/tcp.rs b/libp2p/src/builder/phase/tcp.rs
@@ -97,7 +97,6 @@ macro_rules! impl_tcp_builder {
     };
 }
 
-impl_tcp_builder!("async-std", super::provider::AsyncStd, async_io);
 impl_tcp_builder!("tokio", super::provider::Tokio, tokio);
 
 impl<Provider> SwarmBuilder<Provider, TcpPhase> {
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
@@ -30,7 +30,7 @@ futures = { workspace = true }
 libp2p-identity = { workspace = true, features = ["rand"] }
 libp2p-muxer-test-harness = { path = "../test-harness" }
 libp2p-plaintext = { workspace = true }
-libp2p-tcp = { workspace = true, features = ["async-io"] }
+libp2p-tcp = { workspace = true, features = ["tokio"] }
 quickcheck = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/muxers/mplex/benches/split_send_size.rs b/muxers/mplex/benches/split_send_size.rs
@@ -186,7 +186,7 @@ fn tcp_transport(split_send_size: usize) -> BenchTransport {
     let mut mplex = mplex::Config::default();
     mplex.set_split_send_size(split_send_size);
 
-    libp2p_tcp::async_io::Transport::new(libp2p_tcp::Config::default().nodelay(true))
+    libp2p_tcp::tokio::Transport::new(libp2p_tcp::Config::default().nodelay(true))
         .upgrade(upgrade::Version::V1)
         .authenticate(plaintext::Config::new(
             &identity::Keypair::generate_ed25519(),
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
@@ -32,7 +32,7 @@ libp2p-plaintext = { workspace = true }
 libp2p-relay = { workspace = true }
 libp2p-swarm = { workspace = true, features = ["macros"] }
 libp2p-swarm-test = { path = "../../swarm-test" }
-libp2p-tcp = { workspace = true, features = ["async-io"] }
+libp2p-tcp = { workspace = true, features = ["tokio"] }
 libp2p-yamux = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = { workspace = true, features = ["rt", "macros"] }
diff --git a/protocols/dcutr/tests/lib.rs b/protocols/dcutr/tests/lib.rs
@@ -135,7 +135,7 @@ fn build_client() -> Swarm<Client> {
 
     let transport = relay_transport
         .or_transport(MemoryTransport::default())
-        .or_transport(libp2p_tcp::async_io::Transport::default())
+        .or_transport(libp2p_tcp::tokio::Transport::default())
         .upgrade(Version::V1)
         .authenticate(plaintext::Config::new(&local_key))
         .multiplex(libp2p_yamux::Config::default())
diff --git a/transports/tcp/CHANGELOG.md b/transports/tcp/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.44.0
+
+- Remove `async-std` support.
+  See [PR 5955](https://github.com/libp2p/rust-libp2p/pull/5955)
+
 ## 0.43.0
 
 - Fix the disabling of Nagle's algorithm, which requires setting `TCP_NODELAY` to _true_.
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
@@ -3,15 +3,14 @@ name = "libp2p-tcp"
 edition.workspace = true
 rust-version = { workspace = true }
 description = "TCP/IP transport protocol for libp2p"
-version = "0.43.0"
+version = "0.44.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-async-io = { version = "2.3.3", optional = true }
 futures = { workspace = true }
 futures-timer = "3.0"
 if-watch = { workspace = true }
@@ -23,10 +22,8 @@ tracing = { workspace = true }
 
 [features]
 tokio = ["dep:tokio", "if-watch/tokio"]
-async-io = ["dep:async-io", "if-watch/smol"]
 
 [dev-dependencies]
-async-std = { version = "1.6.5", features = ["attributes"] }
 tokio = { workspace = true, features = ["full"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
diff --git a/transports/tcp/src/lib.rs b/transports/tcp/src/lib.rs
diff --git a/transports/tcp/src/provider.rs b/transports/tcp/src/provider.rs
diff --git a/transports/tcp/src/provider/async_io.rs b/transports/tcp/src/provider/async_io.rs

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ full = [`
`53`	`53`	`"upnp",`
`54`	`54`	`]`
`55`	`55`
`56`		`-async-std = ["libp2p-swarm/async-std", "libp2p-tcp?/async-io"]`
	`56`	`+async-std = ["libp2p-swarm/async-std"]`
`57`	`57`	`autonat = ["dep:libp2p-autonat"]`
`58`	`58`	`cbor = ["libp2p-request-response?/cbor"]`
`59`	`59`	`dcutr = ["dep:libp2p-dcutr", "libp2p-metrics?/dcutr"]`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ macro_rules! impl_tcp_builder {`
`97`	`97`	`};`
`98`	`98`	`}`
`99`	`99`
`100`		`-impl_tcp_builder!("async-std", super::provider::AsyncStd, async_io);`
`101`	`100`	`impl_tcp_builder!("tokio", super::provider::Tokio, tokio);`
`102`	`101`
`103`	`102`	`impl<Provider> SwarmBuilder<Provider, TcpPhase> {`