fix: fix Trust DNS leftovers (#736)

* fix: fix Trust DNS leftovers

* chore: update MSRV

Author: JohnTitor

Cargo.toml

@@ -19,7 +19,7 @@ homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-net"
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.76"
 
 [patch.crates-io]
 actix-codec = { path = "actix-codec" }

actix-codec/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
+- Minimum supported Rust version (MSRV) is now 1.76.
 
 ## 0.5.2
 

actix-macros/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
+- Minimum supported Rust version (MSRV) is now 1.76.
 
 ## 0.2.4
 

actix-rt/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.76.
+
 ## 2.11.0
 
 - Implement `ActixStream` for `tokio::io::BufReader<IO>`.

actix-server/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Minimum supported Rust version (MSRV) is now 1.76.
+
 ## 2.6.0
 
 - Add `ServerBuilder::shutdown_signal()` method.

actix-service/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
+- Minimum supported Rust version (MSRV) is now 1.76.
 
 ## 2.0.3
 

actix-tls/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
+- Minimum supported Rust version (MSRV) is now 1.76.
 
 ## 3.4.0
 

actix-tls/src/connect/resolve.rs

@@ -13,11 +13,11 @@ use futures_core::future::LocalBoxFuture;
 /// use actix_tls::connect::{Resolve, Resolver};
 /// use futures_util::future::LocalBoxFuture;
 ///
-/// // use trust-dns async tokio resolver
-/// use trust_dns_resolver::TokioAsyncResolver;
+/// // use Hickory DNS tokio resolver
+/// use hickory_resolver::TokioResolver;
 ///
 /// struct MyResolver {
-///     trust_dns: TokioAsyncResolver,
+///     hickory_dns: TokioResolver,
 /// };
 ///
 /// // impl Resolve trait and convert given host address str and port to SocketAddr.
@@ -29,7 +29,7 @@ use futures_core::future::LocalBoxFuture;
 ///     ) -> LocalBoxFuture<'a, Result<Vec<SocketAddr>, Box<dyn std::error::Error>>> {
 ///         Box::pin(async move {
 ///             let res = self
-///                 .trust_dns
+///                 .hickory_dns
 ///                 .lookup_ip(host)
 ///                 .await?
 ///                 .iter()
@@ -41,7 +41,7 @@ use futures_core::future::LocalBoxFuture;
 /// }
 ///
 /// let my_resolver = MyResolver {
-///     trust_dns: TokioAsyncResolver::tokio_from_system_conf().unwrap(),
+///     hickory_dns: TokioResolver::builder_tokio().unwrap().build(),
 /// };
 ///
 /// // wrap custom resolver

actix-tls/tests/test_resolvers.rs

@@ -55,7 +55,7 @@ async fn custom_resolver_connect() {
     let srv = TestServer::start(|| fn_service(|_io: TcpStream| async { Ok::<_, io::Error>(()) }));
 
     struct MyResolver {
-        trust_dns: TokioResolver,
+        hickory_dns: TokioResolver,
     }
 
     impl Resolve for MyResolver {
@@ -66,7 +66,7 @@ async fn custom_resolver_connect() {
         ) -> LocalBoxFuture<'a, Result<Vec<SocketAddr>, Box<dyn std::error::Error>>> {
             Box::pin(async move {
                 let res = self
-                    .trust_dns
+                    .hickory_dns
                     .lookup_ip(host)
                     .await?
                     .iter()
@@ -78,7 +78,7 @@ async fn custom_resolver_connect() {
     }
 
     let resolver = MyResolver {
-        trust_dns: TokioResolver::builder_tokio().unwrap().build(),
+        hickory_dns: TokioResolver::builder_tokio().unwrap().build(),
     };
 
     let factory = connector_factory(Resolver::custom(resolver));

actix-tracing/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.75.
+- Minimum supported Rust version (MSRV) is now 1.76.
 
 ## 0.1.0