From 7bf67230386f5f2f2efccfc22c29db3a2ed6069a Mon Sep 17 00:00:00 2001 From: "oxide-renovate[bot]" <146848827+oxide-renovate[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 04:08:11 +0000 Subject: [PATCH] chore(deps): update trust-dns monorepo to 0.23 --- Cargo.lock | 118 +++++++++++++++++++++++++++++--------- Cargo.toml | 8 +-- workspace-hack/Cargo.toml | 4 +- 3 files changed, 98 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de1daf662b5..72db03a040e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2024,8 +2024,8 @@ dependencies = [ "tokio", "toml 0.8.8", "trust-dns-client", - "trust-dns-proto", - "trust-dns-resolver", + "trust-dns-proto 0.23.2", + "trust-dns-resolver 0.23.2", "trust-dns-server", "uuid", ] @@ -2108,6 +2108,15 @@ dependencies = [ "uuid", ] +[[package]] +name = "drain" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f1a0abf3fcefad9b4dd0e414207a7408e12b68414a01e6bb19b897d5bd7632d" +dependencies = [ + "tokio", +] + [[package]] name = "dropshot" version = "0.9.1-dev" @@ -2283,7 +2292,7 @@ dependencies = [ "russh-keys", "tokio", "toml 0.8.8", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", ] [[package]] @@ -2304,6 +2313,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "env_logger" version = "0.9.3" @@ -3586,7 +3607,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", "uuid", ] @@ -3604,8 +3625,8 @@ dependencies = [ "reqwest", "slog", "thiserror", - "trust-dns-proto", - "trust-dns-resolver", + "trust-dns-proto 0.22.0", + "trust-dns-resolver 0.22.0", "uuid", ] @@ -3621,7 +3642,7 @@ dependencies = [ "omicron-workspace-hack", "slog", "tokio", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", ] [[package]] @@ -4500,7 +4521,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "slog", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", "uuid", ] @@ -5114,7 +5135,7 @@ dependencies = [ "tokio", "tokio-postgres", "tough", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", "uuid", ] @@ -5446,7 +5467,7 @@ dependencies = [ "toml_edit 0.19.15", "toml_edit 0.21.0", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.23.2", "unicode-bidi", "unicode-normalization", "unicode-xid", @@ -5677,7 +5698,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", "uuid", ] @@ -9344,22 +9365,21 @@ dependencies = [ [[package]] name = "trust-dns-client" -version = "0.22.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c408c32e6a9dbb38037cece35740f2cf23c875d8ca134d33631cec83f74d3fe" +checksum = "14135e72c7e6d4c9b6902d4437881a8598f0145dbb2e3f86f92dbad845b61e63" dependencies = [ "cfg-if 1.0.0", "data-encoding", "futures-channel", "futures-util", - "lazy_static", + "once_cell", "radix_trie", "rand 0.8.5", "thiserror", - "time", "tokio", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.23.2", ] [[package]] @@ -9371,7 +9391,7 @@ dependencies = [ "async-trait", "cfg-if 1.0.0", "data-encoding", - "enum-as-inner", + "enum-as-inner 0.5.1", "futures-channel", "futures-io", "futures-util", @@ -9387,6 +9407,31 @@ dependencies = [ "url", ] +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if 1.0.0", + "data-encoding", + "enum-as-inner 0.6.0", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "smallvec 1.11.0", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + [[package]] name = "trust-dns-resolver" version = "0.22.0" @@ -9404,29 +9449,50 @@ dependencies = [ "thiserror", "tokio", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.22.0", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if 1.0.0", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.1", + "rand 0.8.5", + "resolv-conf", + "smallvec 1.11.0", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto 0.23.2", ] [[package]] name = "trust-dns-server" -version = "0.22.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99022f9befa6daec2a860be68ac28b1f0d9d7ccf441d8c5a695e35a58d88840d" +checksum = "c540f73c2b2ec2f6c54eabd0900e7aafb747a820224b742f556e8faabb461bc7" dependencies = [ "async-trait", "bytes", "cfg-if 1.0.0", - "enum-as-inner", + "drain", + "enum-as-inner 0.6.0", "futures-executor", "futures-util", "serde", "thiserror", "time", "tokio", - "toml 0.5.11", + "toml 0.7.8", "tracing", - "trust-dns-client", - "trust-dns-proto", + "trust-dns-proto 0.23.2", ] [[package]] @@ -9563,7 +9629,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "rand 0.8.5", "static_assertions", ] @@ -10237,7 +10303,7 @@ dependencies = [ "tokio-util", "toml 0.8.8", "tough", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", "tufaceous", "tufaceous-lib", "update-engine", diff --git a/Cargo.toml b/Cargo.toml index 0e139465339..241bd469044 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -370,10 +370,10 @@ toml = "0.8.8" toml_edit = "0.21.0" topological-sort = "0.2.2" tough = { version = "0.14", features = [ "http" ] } -trust-dns-client = "0.22" -trust-dns-proto = "0.22" -trust-dns-resolver = "0.22" -trust-dns-server = "0.22" +trust-dns-client = "0.23" +trust-dns-proto = "0.23" +trust-dns-resolver = "0.23" +trust-dns-server = "0.23" trybuild = "1.0.85" tufaceous = { path = "tufaceous" } tufaceous-lib = { path = "tufaceous-lib" } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index be9ebd78478..ecff5352b17 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -98,7 +98,7 @@ tokio-stream = { version = "0.1.14", features = ["net"] } toml = { version = "0.7.8" } toml_edit-647d43efb71741da = { package = "toml_edit", version = "0.21.0", features = ["serde"] } tracing = { version = "0.1.37", features = ["log"] } -trust-dns-proto = { version = "0.22.0" } +trust-dns-proto = { version = "0.23.2", features = ["text-parsing"] } unicode-bidi = { version = "0.3.13" } unicode-normalization = { version = "0.1.22" } usdt = { version = "0.3.5" } @@ -195,7 +195,7 @@ tokio-stream = { version = "0.1.14", features = ["net"] } toml = { version = "0.7.8" } toml_edit-647d43efb71741da = { package = "toml_edit", version = "0.21.0", features = ["serde"] } tracing = { version = "0.1.37", features = ["log"] } -trust-dns-proto = { version = "0.22.0" } +trust-dns-proto = { version = "0.23.2", features = ["text-parsing"] } unicode-bidi = { version = "0.3.13" } unicode-normalization = { version = "0.1.22" } unicode-xid = { version = "0.2.4" }