chore(deps): bump hickory-resolver and hickory-proto

Pull-Request: #5968.

Author: hanabi1224

.github/dependabot.yml

@@ -12,7 +12,6 @@ updates:
       hickory-dns:
         patterns:
           - "hickory-*"
-          - "async-std-resolver"
       opentelemetry:
         patterns:
           - "opentelemetry*"

Cargo.lock

@@ -118,16 +118,15 @@ libp2p-webtransport-websys = { version = "0.5.1", path = "transports/webtranspor
 libp2p-yamux = { version = "0.47.0", path = "muxers/yamux" }
 
 # External dependencies
-async-std-resolver = { version = "0.25.0-alpha.4", default-features = false }
 asynchronous-codec = { version = "0.7.0" }
 env_logger = "0.11"
 futures = "0.3.30"
 futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
 getrandom = "0.2"
 if-watch = "3.2.1"
-hickory-proto = { version = "0.25.0-alpha.4", default-features = false }
-hickory-resolver = { version = "0.25.0-alpha.4", default-features = false }
+hickory-proto = { version = "0.25.2", default-features = false }
+hickory-resolver = { version = "0.25.2", default-features = false }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
 multistream-select = { version = "0.13.0", path = "misc/multistream-select" }

Cargo.toml

@@ -1,7 +1,6 @@
 ## 0.48.0
 
 - Remove `async_std` dependency [PR 5958](https://github.com/libp2p/rust-libp2p/pull/5958)
-
 ## 0.47.0
 
 - Emit `ToSwarm::NewExternalAddrOfPeer` on discovery.

protocols/mdns/CHANGELOG.md

@@ -26,7 +26,7 @@ tokio = { workspace = true, features = ["rt", "time"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [features]
-tokio = ["hickory-resolver/tokio-runtime"]
+tokio = ["hickory-resolver/tokio"]
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling

transports/dns/Cargo.toml

@@ -29,7 +29,7 @@
 //! `/dns6/...` and `/dnsaddr/...` components of the given `Multiaddr` through
 //! a DNS, replacing them with the resolved protocols (typically TCP/IP).
 //!
-//! The `tokio` feature and hence the [`tokio::Transport`] are enabled by default.
+//! The [`tokio::Transport`] is enabled by default under the `tokio` feature.
 //! Tokio users can furthermore opt-in to the `tokio-dns-over-rustls` and
 //! `tokio-dns-over-https-rustls` features.
 //! For more information about these features, please refer to the documentation
@@ -59,7 +59,7 @@
 pub mod tokio {
     use std::sync::Arc;
 
-    use hickory_resolver::{system_conf, TokioResolver};
+    use hickory_resolver::{name_server::TokioConnectionProvider, system_conf, TokioResolver};
     use parking_lot::Mutex;
 
     /// A `Transport` wrapper for performing DNS lookups when dialing `Multiaddr`esses
@@ -82,7 +82,12 @@ pub mod tokio {
         ) -> Transport<T> {
             Transport {
                 inner: Arc::new(Mutex::new(inner)),
-                resolver: TokioResolver::tokio(cfg, opts),
+                resolver: TokioResolver::builder_with_config(
+                    cfg,
+                    TokioConnectionProvider::default(),
+                )
+                .with_options(opts)
+                .build(),
             }
         }
     }
@@ -579,8 +584,6 @@ mod tests {
 
     use super::*;
 
-    // These helpers will be compiled conditionally, depending on the async runtime in use.
-
     fn test_tokio<T, F: Future<Output = ()>>(
         transport: T,
         test_fn: impl FnOnce(tokio::Transport<T>) -> F,