feat: deprecate async_std support in DNS crate

libp2p/CHANGELOG.md

@@ -15,6 +15,9 @@
 
 - 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)
+
+- Remove DNS from the `async-std` swarm builder, as `async-std` support was removed from `libp2p-dns` transport.
+  See [PR 5959](https://github.com/libp2p/rust-libp2p/pull/5959)
 
 ## 0.55.0
 

libp2p/Cargo.toml

@@ -53,7 +53,7 @@ full = [
     "upnp",
 ]
 
-async-std = ["libp2p-swarm/async-std", "libp2p-tcp?/async-io", "libp2p-dns?/async-std"]
+async-std = ["libp2p-swarm/async-std", "libp2p-tcp?/async-io"]
 autonat = ["dep:libp2p-autonat"]
 cbor = ["libp2p-request-response?/cbor"]
 dcutr = ["dep:libp2p-dcutr", "libp2p-metrics?/dcutr"]

libp2p/src/builder/phase/dns.rs

@@ -7,27 +7,6 @@ pub struct DnsPhase<T> {
     pub(crate) transport: T,
 }
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "async-std", feature = "dns"))]
-impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::AsyncStd, DnsPhase<T>> {
-    pub fn with_dns(
-        self,
-    ) -> Result<
-        SwarmBuilder<
-            super::provider::AsyncStd,
-            WebsocketPhase<impl AuthenticatedMultiplexedTransport>,
-        >,
-        std::io::Error,
-    > {
-        Ok(SwarmBuilder {
-            keypair: self.keypair,
-            phantom: PhantomData,
-            phase: WebsocketPhase {
-                transport: libp2p_dns::async_std::Transport::system2(self.phase.transport)?,
-            },
-        })
-    }
-}
-
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio", feature = "dns"))]
 impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::Tokio, DnsPhase<T>> {
     pub fn with_dns(
@@ -49,30 +28,6 @@ impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::Tokio,
     }
 }
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "async-std", feature = "dns"))]
-impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::AsyncStd, DnsPhase<T>> {
-    pub fn with_dns_config(
-        self,
-        cfg: libp2p_dns::ResolverConfig,
-        opts: libp2p_dns::ResolverOpts,
-    ) -> SwarmBuilder<
-        super::provider::AsyncStd,
-        WebsocketPhase<impl AuthenticatedMultiplexedTransport>,
-    > {
-        SwarmBuilder {
-            keypair: self.keypair,
-            phantom: PhantomData,
-            phase: WebsocketPhase {
-                transport: libp2p_dns::async_std::Transport::custom2(
-                    self.phase.transport,
-                    cfg,
-                    opts,
-                ),
-            },
-        }
-    }
-}
-
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio", feature = "dns"))]
 impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::Tokio, DnsPhase<T>> {
     pub fn with_dns_config(

libp2p/src/builder/phase/other_transport.rs

@@ -66,22 +66,6 @@ impl<Provider, T: AuthenticatedMultiplexedTransport>
 }
 
 // Shortcuts
-#[cfg(all(not(target_arch = "wasm32"), feature = "async-std", feature = "dns"))]
-impl<T: AuthenticatedMultiplexedTransport>
-    SwarmBuilder<super::provider::AsyncStd, OtherTransportPhase<T>>
-{
-    pub fn with_dns(
-        self,
-    ) -> Result<
-        SwarmBuilder<
-            super::provider::AsyncStd,
-            WebsocketPhase<impl AuthenticatedMultiplexedTransport>,
-        >,
-        std::io::Error,
-    > {
-        self.without_any_other_transports().with_dns()
-    }
-}
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio", feature = "dns"))]
 impl<T: AuthenticatedMultiplexedTransport>
     SwarmBuilder<super::provider::Tokio, OtherTransportPhase<T>>
@@ -98,22 +82,6 @@ impl<T: AuthenticatedMultiplexedTransport>
         self.without_any_other_transports().with_dns()
     }
 }
-#[cfg(all(not(target_arch = "wasm32"), feature = "async-std", feature = "dns"))]
-impl<T: AuthenticatedMultiplexedTransport>
-    SwarmBuilder<super::provider::AsyncStd, OtherTransportPhase<T>>
-{
-    pub fn with_dns_config(
-        self,
-        cfg: libp2p_dns::ResolverConfig,
-        opts: libp2p_dns::ResolverOpts,
-    ) -> SwarmBuilder<
-        super::provider::AsyncStd,
-        WebsocketPhase<impl AuthenticatedMultiplexedTransport>,
-    > {
-        self.without_any_other_transports()
-            .with_dns_config(cfg, opts)
-    }
-}
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio", feature = "dns"))]
 impl<T: AuthenticatedMultiplexedTransport>
     SwarmBuilder<super::provider::Tokio, OtherTransportPhase<T>>

libp2p/src/builder/phase/quic.rs

@@ -149,22 +149,6 @@ impl<Provider, T: AuthenticatedMultiplexedTransport> SwarmBuilder<Provider, Quic
             .with_behaviour(constructor)
     }
 }
-#[cfg(all(not(target_arch = "wasm32"), feature = "async-std", feature = "dns"))]
-impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::AsyncStd, QuicPhase<T>> {
-    pub fn with_dns(
-        self,
-    ) -> Result<
-        SwarmBuilder<
-            super::provider::AsyncStd,
-            WebsocketPhase<impl AuthenticatedMultiplexedTransport>,
-        >,
-        std::io::Error,
-    > {
-        self.without_quic()
-            .without_any_other_transports()
-            .with_dns()
-    }
-}
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio", feature = "dns"))]
 impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::Tokio, QuicPhase<T>> {
     pub fn with_dns(
@@ -181,21 +165,6 @@ impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::Tokio,
             .with_dns()
     }
 }
-#[cfg(all(not(target_arch = "wasm32"), feature = "async-std", feature = "dns"))]
-impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::AsyncStd, QuicPhase<T>> {
-    pub fn with_dns_config(
-        self,
-        cfg: libp2p_dns::ResolverConfig,
-        opts: libp2p_dns::ResolverOpts,
-    ) -> SwarmBuilder<
-        super::provider::AsyncStd,
-        WebsocketPhase<impl AuthenticatedMultiplexedTransport>,
-    > {
-        self.without_quic()
-            .without_any_other_transports()
-            .with_dns_config(cfg, opts)
-    }
-}
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio", feature = "dns"))]
 impl<T: AuthenticatedMultiplexedTransport> SwarmBuilder<super::provider::Tokio, QuicPhase<T>> {
     pub fn with_dns_config(
@@ -263,13 +232,7 @@ macro_rules! impl_quic_phase_with_websocket {
         }
     }
 }
-impl_quic_phase_with_websocket!(
-    "async-std",
-    super::provider::AsyncStd,
-    rw_stream_sink::RwStreamSink<
-        libp2p_websocket::BytesConnection<libp2p_tcp::async_io::TcpStream>,
-    >
-);
+
 impl_quic_phase_with_websocket!(
     "tokio",
     super::provider::Tokio,

libp2p/src/builder/phase/tcp.rs

@@ -215,13 +215,6 @@ macro_rules! impl_tcp_phase_with_websocket {
         }
     }
 }
-impl_tcp_phase_with_websocket!(
-    "async-std",
-    super::provider::AsyncStd,
-    rw_stream_sink::RwStreamSink<
-        libp2p_websocket::BytesConnection<libp2p_tcp::async_io::TcpStream>,
-    >
-);
 impl_tcp_phase_with_websocket!(
     "tokio",
     super::provider::Tokio,

libp2p/src/builder/phase/websocket.rs

@@ -115,16 +115,6 @@ macro_rules! impl_websocket_builder {
     };
 }
 
-impl_websocket_builder!(
-    "async-std",
-    super::provider::AsyncStd,
-    libp2p_dns::async_std::Transport::system(libp2p_tcp::async_io::Transport::new(
-        libp2p_tcp::Config::default(),
-    )),
-    rw_stream_sink::RwStreamSink<
-        libp2p_websocket::BytesConnection<libp2p_tcp::async_io::TcpStream>,
-    >
-);
 impl_websocket_builder!(
     "tokio",
     super::provider::Tokio,

transports/dns/CHANGELOG.md

@@ -1,8 +1,10 @@
 ## 0.44.0
-
-- Report all transport errors in a dial attempt instead of only returning the last error. 
+
+- Removed `async_std` module [PR 5959](https://github.com/libp2p/rust-libp2p/pull/5959)
+
+- Report all transport errors in a dial attempt instead of only returning the last error.
   See [PR 5899](https://github.com/libp2p/rust-libp2p/pull/5899).
-  
+
 ## 0.43.0
 
 - Upgrade `async-std-resolver` and `hickory-resolver`.

transports/dns/Cargo.toml

@@ -11,7 +11,6 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-async-std-resolver = { workspace = true, features = ["system-config"], optional = true }
 async-trait = "0.1.80"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
@@ -24,11 +23,9 @@ tracing = { workspace = true }
 [dev-dependencies]
 libp2p-identity = { workspace = true, features = ["rand"] }
 tokio = { workspace = true, features = ["rt", "time"] }
-async-std-crate = { package = "async-std", version = "1.6" }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [features]
-async-std = ["async-std-resolver"]
 tokio = ["hickory-resolver/tokio-runtime"]
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.