Upgrade hickory-resolver to 0.25.0-alpha.5 (#2038)

* Upgrade hickory-resolver to 0.25.0-alpha.5

Update dependencies

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix compilation for hickory-resolver

Cleanup use of removed feature

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix resolver.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Pin hickory-resolver to avoid breakage

Cargo considers 0.25.0-alpha.* to be compatible while they can contain breaking changes between alpha versions.

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

---------

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
This commit is contained in:
Jiahao XU 2025-02-11 20:54:04 +11:00 committed by GitHub
parent 7918038770
commit 9b8ba9902d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions

View file

@ -61,7 +61,7 @@ tokio = { version = "1.35.0", features = [
tokio-tar = "0.3.0" tokio-tar = "0.3.0"
tokio-util = { version = "0.7.8", features = ["io"] } tokio-util = { version = "0.7.8", features = ["io"] }
tracing = "0.1.39" tracing = "0.1.39"
hickory-resolver = { version = "0.25.0-alpha.3", optional = true, features = [ hickory-resolver = { version = "=0.25.0-alpha.5", optional = true, features = [
"dnssec-ring", "dnssec-ring",
] } ] }
once_cell = { version = "1.18.0", optional = true } once_cell = { version = "1.18.0", optional = true }
@ -111,7 +111,6 @@ native-tls = [
"__tls", "__tls",
"native-tls-crate", "native-tls-crate",
"reqwest/native-tls", "reqwest/native-tls",
"hickory-resolver?/dns-over-native-tls",
] ]
# Enable hickory-resolver so that features on it will also be enabled. # Enable hickory-resolver so that features on it will also be enabled.

View file

@ -2,7 +2,7 @@ use std::{net::SocketAddr, sync::Arc};
use hickory_resolver::{ use hickory_resolver::{
config::{LookupIpStrategy, ResolverConfig, ResolverOpts}, config::{LookupIpStrategy, ResolverConfig, ResolverOpts},
system_conf, TokioAsyncResolver, system_conf, TokioResolver as TokioAsyncResolver,
}; };
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use reqwest::dns::{Addrs, Name, Resolve, Resolving}; use reqwest::dns::{Addrs, Name, Resolve, Resolving};
@ -50,8 +50,6 @@ fn get_configs() -> Result<(ResolverConfig, ResolverOpts), BoxError> {
protocol, protocol,
tls_dns_name: None, tls_dns_name: None,
trust_negative_responses: false, trust_negative_responses: false,
#[cfg(feature = "rustls")]
tls_config: None,
bind_addr: None, bind_addr: None,
http_endpoint: None, http_endpoint: None,
}) })