From eb712823f73c111a367258c6805e9ac9b154e53f Mon Sep 17 00:00:00 2001 From: John Coffey Date: Thu, 29 Oct 2026 21:40:07 -0700 Subject: [PATCH] Silence the unused h3 warning in the vendored hickory resolver NameServer::new created its h3 connection state under the __tls feature instead of __h3, so every build with TLS and without HTTP/3 (ours) warned about an unused variable. hickory's main has the corrected cfg; release/0.26, which this copy comes from, doesn't yet. VENDORED.md records the change so a re-vendor past it drops it. Checked with and without HTTP/3: no warnings either way. --- vendor/hickory-dns/VENDORED.md | 7 ++++++- vendor/hickory-dns/hickory-resolver/src/name_server.rs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/vendor/hickory-dns/VENDORED.md b/vendor/hickory-dns/VENDORED.md index d98c7261..dee51fab 100644 --- a/vendor/hickory-dns/VENDORED.md +++ b/vendor/hickory-dns/VENDORED.md @@ -18,7 +18,12 @@ UDP answer. ## Changes -None. Each directory is `cargo package --no-verify` of that commit (the +One: in `hickory-resolver/src/name_server.rs`, `let h3` is gated on +`__h3` instead of `__tls`, so a build with TLS but without HTTP/3 (ours) +no longer warns about an unused variable. hickory's `main` has the same +line; `release/0.26` doesn't yet. Drop it when re-vendoring past it. + +Otherwise each directory is `cargo package --no-verify` of that commit (the manifest normalized, so it builds outside hickory's workspace), without `Cargo.lock`, `Cargo.toml.orig` and `.cargo_vcs_info.json` (the repository ignores dotfiles; the commit is recorded above). diff --git a/vendor/hickory-dns/hickory-resolver/src/name_server.rs b/vendor/hickory-dns/hickory-resolver/src/name_server.rs index e94d34fe..e5c0aa71 100644 --- a/vendor/hickory-dns/hickory-resolver/src/name_server.rs +++ b/vendor/hickory-dns/hickory-resolver/src/name_server.rs @@ -91,7 +91,7 @@ impl NameServer

{ let https = Arc::from(ConnectionMeta::default()); #[cfg(feature = "__quic")] let quic = Arc::from(ConnectionMeta::default()); - #[cfg(feature = "__tls")] + #[cfg(feature = "__h3")] let h3 = Arc::from(ConnectionMeta::default()); let mut connections = connections -- 2.54.0