Skip to content

deps: bump hickory-resolver to 0.26.0-beta.3 #4105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Frando wants to merge 1 commit into from
Closed

deps: bump hickory-resolver to 0.26.0-beta.3 #4105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion iroh-relay/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = tr

# non-wasm-in-browser dependencies
[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
hickory-resolver = { version = "=0.26.0-beta.1", features = ["tokio", "system-config"] }
hickory-resolver = { version = "=0.26.0-beta.3", features = ["tokio", "system-config"] }
tokio = { version = "1", features = [
"io-util",
"macros",
Expand Down
2 changes: 1 addition & 1 deletion iroh-relay/src/dns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ impl Resolver for HickoryResolver {
// I don't know a way of avoiding this deep copy, even if it's agonizing.
// The representation of `TxtRecrodData` and `hickory_proto::rr::rdata::TXT`
// is identical.
Some(TxtRecordData::from(txt.txt_data().to_vec()))
Some(TxtRecordData::from(txt.txt_data.to_vec()))
}
_ => None,
}
Expand Down
2 changes: 1 addition & 1 deletion iroh-relay/src/endpoint_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ mod tests {
.answers()
.iter()
.filter_map(|record| match record.data() {
RData::TXT(txt) => Some(TxtRecordData::from(txt.txt_data().to_vec())),
RData::TXT(txt) => Some(TxtRecordData::from(txt.txt_data.to_vec())),
_ => None,
});

Expand Down
2 changes: 1 addition & 1 deletion iroh/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ sync_wrapper = { version = "1.0.2", features = ["futures"] }

# non-wasm-in-browser dependencies
[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
hickory-resolver = { version = "=0.26.0-beta.1", default-features = false }
hickory-resolver = { version = "=0.26.0-beta.3", default-features = false }
portmapper = { version = "0.15", optional = true, default-features = false }
noq = { version = "0.17.0", default-features = false, features = ["runtime-tokio", "rustls"] }
tokio = { version = "1", features = [
Expand Down
6 changes: 3 additions & 3 deletions iroh/src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ pub(crate) mod dns_server {
buf: &[u8],
) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
let packet = Message::from_bytes(buf)?;
debug!(queries = ?packet.queries(), %from, "received query");
let mut reply = packet.to_response();
debug!(queries = ?packet.queries, %from, "received query");
let mut reply = packet.clone().into_response();
self.resolver.resolve(&packet, &mut reply).await?;
debug!(?reply, %from, "send reply");
let buf = reply.to_vec()?;
Expand Down Expand Up @@ -453,7 +453,7 @@ pub(crate) mod pkarr_dns_state {
reply: &mut hickory_resolver::proto::op::Message,
ttl: u32,
) -> std::io::Result<()> {
for query in query.queries() {
for query in &query.queries {
let domain_name = query.name().to_string();
let Some(endpoint_id) = endpoint_id_from_domain_name(&domain_name) else {
continue;
Expand Down
Loading