Skip to content
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.

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

build(deps): Update trust-dns to v0.21.0-alpha.1 #1105

Merged
merged 1 commit into from
Jun 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,9 @@ dependencies = [

[[package]]
name = "idna"
version = "0.2.1"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094"
checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
dependencies = [
"matches",
"unicode-bidi",
Expand Down Expand Up @@ -2447,8 +2447,8 @@ dependencies = [

[[package]]
name = "trust-dns-proto"
version = "0.20.1"
source = "git+https://github.com/bluejekyll/trust-dns?branch=main#bbc9d5e9156f48102d246791e4ffa6e94962eebc"
version = "0.21.0-alpha.1"
source = "git+https://github.com/bluejekyll/trust-dns?branch=main#ed9f05b102755178f3aa23f09c368b66d5972950"
dependencies = [
"async-trait",
"cfg-if",
Expand All @@ -2471,8 +2471,8 @@ dependencies = [

[[package]]
name = "trust-dns-resolver"
version = "0.20.1"
source = "git+https://github.com/bluejekyll/trust-dns?branch=main#bbc9d5e9156f48102d246791e4ffa6e94962eebc"
version = "0.21.0-alpha.1"
source = "git+https://github.com/bluejekyll/trust-dns?branch=main#ed9f05b102755178f3aa23f09c368b66d5972950"
dependencies = [
"cfg-if",
"futures-util",
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,4 @@ debug = false
debug = false

[patch.crates-io]
trust-dns-proto = { git = "https://github.com/bluejekyll/trust-dns", branch = "main" }
trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns", branch = "main" }
webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.21" }
7 changes: 4 additions & 3 deletions linkerd/dns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ tokio = { version = "1", features = ["rt", "sync", "time"] }
pin-project = "1"

[dependencies.trust-dns-resolver]
# Pinned until 0.21.0 is released with
# https://github.com/bluejekyll/trust-dns/commit/6dfc6713.
version = "=0.20.1"
# We need to use a git dependency to pick up bluejekyll/trust-dns@6dfc6713.
version = "0.21.0-alpha.1"
git = "https://github.com/bluejekyll/trust-dns"
branch = "main"
default-features = false
features = ["system-config", "tokio-runtime"]
4 changes: 0 additions & 4 deletions linkerd/dns/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,3 @@ name = "fuzz_target_1"
path = "fuzz_targets/fuzz_target_1.rs"
test = false
doc = false

[patch.crates-io]
trust-dns-proto = { git = "https://github.com/bluejekyll/trust-dns", branch = "main" }
trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns", branch = "main" }