From ca380c4c8c7256cdf6ac608b3a4239bbd86a3f82 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 23 Sep 2025 10:21:18 +0900 Subject: [PATCH] fix: fix Trust DNS leftovers (#736) * fix: fix Trust DNS leftovers * chore: update MSRV --- Cargo.toml | 2 +- actix-codec/CHANGES.md | 2 +- actix-macros/CHANGES.md | 2 +- actix-rt/CHANGES.md | 2 ++ actix-server/CHANGES.md | 2 ++ actix-service/CHANGES.md | 2 +- actix-tls/CHANGES.md | 2 +- actix-tls/src/connect/resolve.rs | 10 +++++----- actix-tls/tests/test_resolvers.rs | 6 +++--- actix-tracing/CHANGES.md | 2 +- actix-utils/CHANGES.md | 2 +- bytestring/CHANGES.md | 2 ++ local-channel/CHANGES.md | 2 +- local-waker/CHANGES.md | 2 +- 14 files changed, 23 insertions(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b45f24e9..74792da7 100644 --- a/Cargo.toml +++ b/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" } diff --git a/actix-codec/CHANGES.md b/actix-codec/CHANGES.md index d8e6f2c3..f50ded24 100644 --- a/actix-codec/CHANGES.md +++ b/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 diff --git a/actix-macros/CHANGES.md b/actix-macros/CHANGES.md index 4a4634ed..3900129e 100644 --- a/actix-macros/CHANGES.md +++ b/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 diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md index 1ad3dd0f..b651ac7a 100644 --- a/actix-rt/CHANGES.md +++ b/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`. diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md index c36cf2ee..729953f0 100644 --- a/actix-server/CHANGES.md +++ b/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. diff --git a/actix-service/CHANGES.md b/actix-service/CHANGES.md index 64f38dbb..7a31a56f 100644 --- a/actix-service/CHANGES.md +++ b/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 diff --git a/actix-tls/CHANGES.md b/actix-tls/CHANGES.md index 85998914..daeb1578 100644 --- a/actix-tls/CHANGES.md +++ b/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 diff --git a/actix-tls/src/connect/resolve.rs b/actix-tls/src/connect/resolve.rs index 33e2c676..9270ba35 100644 --- a/actix-tls/src/connect/resolve.rs +++ b/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, Box>> { /// 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 diff --git a/actix-tls/tests/test_resolvers.rs b/actix-tls/tests/test_resolvers.rs index d2db64fe..7a5beafd 100644 --- a/actix-tls/tests/test_resolvers.rs +++ b/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, Box>> { 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)); diff --git a/actix-tracing/CHANGES.md b/actix-tracing/CHANGES.md index c3fee521..8f59bb50 100644 --- a/actix-tracing/CHANGES.md +++ b/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 diff --git a/actix-utils/CHANGES.md b/actix-utils/CHANGES.md index 8fda9606..9cd71ef3 100644 --- a/actix-utils/CHANGES.md +++ b/actix-utils/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.0.1 diff --git a/bytestring/CHANGES.md b/bytestring/CHANGES.md index 392a7132..d82400d7 100644 --- a/bytestring/CHANGES.md +++ b/bytestring/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.76. + ## 1.5.0 - Migrate `serde` dependency to `serde_core`. diff --git a/local-channel/CHANGES.md b/local-channel/CHANGES.md index 91f1f54d..fbd52108 100644 --- a/local-channel/CHANGES.md +++ b/local-channel/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.5 diff --git a/local-waker/CHANGES.md b/local-waker/CHANGES.md index e321d27b..72431a08 100644 --- a/local-waker/CHANGES.md +++ b/local-waker/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.4