From 5af9e4d7950012b39c99e50b245e58e029f5b227 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 10:15:45 -0800 Subject: [PATCH] build(deps): bump trust-dns-resolver from 0.21.0-alpha.5 to 0.21.1 (#1522) Bumps [trust-dns-resolver](https://github.com/bluejekyll/trust-dns) from 0.21.0-alpha.5 to 0.21.1. - [Release notes](https://github.com/bluejekyll/trust-dns/releases) - [Changelog](https://github.com/bluejekyll/trust-dns/blob/main/CHANGELOG.md) - [Commits](https://github.com/bluejekyll/trust-dns/compare/v0.21.0-alpha.5...v0.21.1) --- updated-dependencies: - dependency-name: trust-dns-resolver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit 579651b47091b4772cf190aa6fbe05d0774d9710) Signed-off-by: Oliver Gould --- Cargo.lock | 25 ++++++++++++++++--------- deny.toml | 5 +++-- linkerd/dns/Cargo.toml | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5d7edcd4c9..aa78fd63f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -182,11 +182,11 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "enum-as-inner" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ - "heck", + "heck 0.4.0", "proc-macro2", "quote", "syn", @@ -382,6 +382,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1378,6 +1384,7 @@ dependencies = [ "linkerd-proxy-transport", "linkerd-stack", "linkerd-tracing", + "pin-project", "thiserror", "tokio", "tokio-rustls", @@ -1658,7 +1665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api", - "parking_lot_core 0.9.0", + "parking_lot_core 0.9.1", ] [[package]] @@ -1780,7 +1787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", - "heck", + "heck 0.3.3", "itertools", "lazy_static", "log", @@ -2413,9 +2420,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.21.0-alpha.5" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df4689a56fb36e79b76d13f52056c116f1f014afb1bd330162f2d9dc08ef5405" +checksum = "2861b3ed517888174d13909e675c4e94b3291867512068be59d76533e4d1270c" dependencies = [ "async-trait", "cfg-if", @@ -2438,9 +2445,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.21.0-alpha.5" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f2ce3a81fcddc72de8da5852c4ea0a5507bd129c0aa20a2354a1b1e51d6813a" +checksum = "d9e737a252a617bd4774649e245dbf705e207275db0893b9fa824d49f074fc1c" dependencies = [ "cfg-if", "futures-util", diff --git a/deny.toml b/deny.toml index 2407c8a383..30ea8fc5f1 100644 --- a/deny.toml +++ b/deny.toml @@ -48,11 +48,12 @@ deny = [ { name = "rustls", wrappers = ["tokio-rustls"] }, ] skip = [ - # Waiting on a hyper release that updates itoa to v1. - { name = "itoa", version = "0.4" }, # Waiting on a tokio release that updates parking_lot to v0.12. { name = "parking_lot", version = "0.11" }, { name = "parking_lot_core", version = "0.8" }, + # Waiting on a prost-build release that includes + # https://github.com/tokio-rs/prost/pull/583 + { name = "heck", version = "0.3" }, # waiting on `h2` and `tower` releases that update h2 to v0.7 { name = "tokio-util", version = "0.6" } ] diff --git a/linkerd/dns/Cargo.toml b/linkerd/dns/Cargo.toml index 0fcce0c040..3188592548 100644 --- a/linkerd/dns/Cargo.toml +++ b/linkerd/dns/Cargo.toml @@ -12,5 +12,5 @@ linkerd-dns-name = { path = "./name" } linkerd-error = { path = "../error" } thiserror = "1" tracing = "0.1" -trust-dns-resolver = "0.21.0-alpha.5" +trust-dns-resolver = "0.21.1" tokio = { version = "1", features = ["rt", "sync", "time"] }