berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: fix Trust DNS leftovers (#736) 

* fix: fix Trust DNS leftovers

* chore: update MSRV
This commit is contained in:
Yuki Okushi 2025-09-23 10:21:18 +09:00 committed by GitHub
parent 5904bd2997
commit ca380c4c8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

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

2
actix-codec/CHANGES.md
View File

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

2
actix-macros/CHANGES.md
View File

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

2
actix-rt/CHANGES.md
View File

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

2
actix-server/CHANGES.md
View File

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

2
actix-service/CHANGES.md
View File

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

2
actix-tls/CHANGES.md
View File

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

10
actix-tls/src/connect/resolve.rs
View File

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

6
actix-tls/tests/test_resolvers.rs
View File

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

2
actix-tracing/CHANGES.md
View File

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

2
actix-utils/CHANGES.md
View File

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

2
bytestring/CHANGES.md
View File

@ -2,6 +2,8 @@
## Unreleased ## Unreleased
- Minimum supported Rust version (MSRV) is now 1.76.
## 1.5.0 ## 1.5.0
- Migrate `serde` dependency to `serde_core`. - Migrate `serde` dependency to `serde_core`.

2
local-channel/CHANGES.md
View File

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

2
local-waker/CHANGES.md
View File

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