diff --git a/Cargo.lock b/Cargo.lock index e38b11faf..317bf0969 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,7 +279,7 @@ dependencies = [ "strum", "target-lexicon", "tempfile", - "thiserror", + "thiserror 2.0.1", "tokio", "tracing", "url", @@ -296,7 +296,7 @@ dependencies = [ "leon", "miette", "normalize-path", - "thiserror", + "thiserror 2.0.1", "tracing", ] @@ -326,7 +326,7 @@ dependencies = [ "serde", "serde_json", "tempfile", - "thiserror", + "thiserror 2.0.1", "tokio", "tokio-tar", "tokio-util", @@ -354,7 +354,7 @@ dependencies = [ "minisign-verify", "once_cell", "strum", - "thiserror", + "thiserror 2.0.1", "tokio", "tracing", "url", @@ -371,7 +371,7 @@ dependencies = [ "serde", "serde-tuple-vec-map", "serde_json", - "thiserror", + "thiserror 2.0.1", "tokio", "tracing", "tracing-subscriber", @@ -395,7 +395,7 @@ dependencies = [ "serde-tuple-vec-map", "serde_json", "tempfile", - "thiserror", + "thiserror 2.0.1", "toml_edit", "url", ] @@ -420,7 +420,7 @@ dependencies = [ "sha2", "simple-git", "tempfile", - "thiserror", + "thiserror 2.0.1", "tokio", "toml_edit", "tracing", @@ -609,7 +609,7 @@ dependencies = [ "normalize-path", "serde", "tempfile", - "thiserror", + "thiserror 2.0.1", "tracing", ] @@ -624,7 +624,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1078,9 +1078,9 @@ checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "file-format" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffe3a660c3a1b10e96f304a9413d673b2118d62e4520f7ddf4a4faccfe8b9b9" +checksum = "e7ef3d5e8ae27277c8285ac43ed153158178ef0f79567f32024ca8140a0c7cd8" [[package]] name = "filetime" @@ -1317,7 +1317,7 @@ dependencies = [ "gix-worktree-state", "once_cell", "smallvec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1330,7 +1330,7 @@ dependencies = [ "gix-date", "gix-utils", "itoa", - "thiserror", + "thiserror 1.0.68", "winnow 0.6.20", ] @@ -1347,7 +1347,7 @@ dependencies = [ "gix-trace", "kstring", "smallvec", - "thiserror", + "thiserror 1.0.68", "unicode-bom", ] @@ -1357,7 +1357,7 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10f78312288bd02052be5dbc2ecbc342c9f4eb791986d86c0a5c06b92dc72efa" dependencies = [ - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1366,7 +1366,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c28b58ba04f0c004722344390af9dbc85888fbb84be1981afb934da4114d4cf" dependencies = [ - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1392,7 +1392,7 @@ dependencies = [ "gix-features", "gix-hash", "memmap2", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1411,7 +1411,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror", + "thiserror 1.0.68", "unicode-bom", "winnow 0.6.20", ] @@ -1426,7 +1426,7 @@ dependencies = [ "bstr", "gix-path", "libc", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1443,7 +1443,7 @@ dependencies = [ "gix-sec", "gix-trace", "gix-url", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1455,7 +1455,7 @@ dependencies = [ "bstr", "itoa", "jiff", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1467,7 +1467,7 @@ dependencies = [ "bstr", "gix-hash", "gix-object", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1483,7 +1483,7 @@ dependencies = [ "gix-path", "gix-ref", "gix-sec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1506,7 +1506,7 @@ dependencies = [ "prodash", "sha1", "sha1_smol", - "thiserror", + "thiserror 1.0.68", "walkdir", ] @@ -1528,7 +1528,7 @@ dependencies = [ "gix-trace", "gix-utils", "smallvec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1561,7 +1561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "952c3a29f1bc1007cc901abce7479943abfa42016db089de33d0a4fa3c85bfe8" dependencies = [ "faster-hex", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1613,7 +1613,7 @@ dependencies = [ "memmap2", "rustix", "smallvec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1624,7 +1624,7 @@ checksum = "5102acdf4acae2644e38dbbd18cdfba9597a218f7d85f810fe5430207e03c2de" dependencies = [ "gix-tempfile", "gix-utils", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1640,7 +1640,7 @@ dependencies = [ "gix-object", "gix-revwalk", "smallvec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1659,7 +1659,7 @@ dependencies = [ "gix-validate", "itoa", "smallvec", - "thiserror", + "thiserror 1.0.68", "winnow 0.6.20", ] @@ -1681,7 +1681,7 @@ dependencies = [ "gix-quote", "parking_lot", "tempfile", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1701,7 +1701,7 @@ dependencies = [ "memmap2", "parking_lot", "smallvec", - "thiserror", + "thiserror 1.0.68", "uluru", ] @@ -1714,7 +1714,7 @@ dependencies = [ "bstr", "faster-hex", "gix-trace", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1726,7 +1726,7 @@ dependencies = [ "bstr", "faster-hex", "gix-trace", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1739,7 +1739,7 @@ dependencies = [ "gix-trace", "home", "once_cell", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1754,7 +1754,7 @@ dependencies = [ "gix-config-value", "gix-glob", "gix-path", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1767,7 +1767,7 @@ dependencies = [ "gix-config-value", "parking_lot", "rustix", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1784,7 +1784,7 @@ dependencies = [ "gix-transport", "gix-utils", "maybe-async", - "thiserror", + "thiserror 1.0.68", "winnow 0.6.20", ] @@ -1796,7 +1796,7 @@ checksum = "f89f9a1525dcfd9639e282ea939f5ab0d09d93cf2b90c1fc6104f1b9582a8e49" dependencies = [ "bstr", "gix-utils", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1816,7 +1816,7 @@ dependencies = [ "gix-utils", "gix-validate", "memmap2", - "thiserror", + "thiserror 1.0.68", "winnow 0.6.20", ] @@ -1831,7 +1831,7 @@ dependencies = [ "gix-revision", "gix-validate", "smallvec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1846,7 +1846,7 @@ dependencies = [ "gix-hash", "gix-object", "gix-revwalk", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1861,7 +1861,7 @@ dependencies = [ "gix-hashtable", "gix-object", "smallvec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1888,7 +1888,7 @@ dependencies = [ "gix-pathspec", "gix-refspec", "gix-url", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1926,7 +1926,7 @@ dependencies = [ "gix-sec", "gix-url", "reqwest", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1943,7 +1943,7 @@ dependencies = [ "gix-object", "gix-revwalk", "smallvec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1955,7 +1955,7 @@ dependencies = [ "bstr", "gix-features", "gix-path", - "thiserror", + "thiserror 1.0.68", "url", ] @@ -1976,7 +1976,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e187b263461bc36cea17650141567753bc6207d036cedd1de6e81a52f277ff68" dependencies = [ "bstr", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2015,7 +2015,7 @@ dependencies = [ "gix-path", "gix-worktree", "io-close", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2055,21 +2055,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "h3" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5069de1c2ac82d9e361b07f2b8a2c582ec071750e063530fc7f3b5197e24805" -dependencies = [ - "bytes", - "fastrand", - "futures-util", - "http", - "pin-project-lite", - "tokio", - "tracing", -] - [[package]] name = "h3" version = "0.0.6" @@ -2084,20 +2069,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "h3-quinn" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8c01d99d7cf812fd34ddf135e6c940df9e24f2e759dbc7179fb0e54d4bd6551" -dependencies = [ - "bytes", - "futures", - "h3 0.0.5", - "quinn", - "tokio", - "tokio-util", -] - [[package]] name = "h3-quinn" version = "0.0.7" @@ -2106,7 +2077,7 @@ checksum = "17c799f413fceeea505236c4d8132f084ff4b55a652288d91439ee93dc24d855" dependencies = [ "bytes", "futures", - "h3 0.0.6", + "h3", "quinn", "tokio", "tokio-util", @@ -2142,9 +2113,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hickory-proto" -version = "0.25.0-alpha.2" +version = "0.25.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8270a1857fb962b9914aafd46a89a187a4e63d0eb4190c327e7c7b8256a2d055" +checksum = "993f9d675890080b3bab88e475e6a0db4fe96b39b2fbd42a72eb315dc9009798" dependencies = [ "async-recursion", "async-trait", @@ -2157,8 +2128,8 @@ dependencies = [ "futures-io", "futures-util", "h2", - "h3 0.0.5", - "h3-quinn 0.0.6", + "h3", + "h3-quinn", "http", "idna 0.5.0", "ipnet", @@ -2169,8 +2140,7 @@ dependencies = [ "rand", "ring", "rustls", - "rustls-pemfile", - "thiserror", + "thiserror 1.0.68", "time", "tinyvec", "tokio", @@ -2182,9 +2152,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.25.0-alpha.2" +version = "0.25.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c110355b5703070d9e29c344d79818a7cde3de9c27fc35750defea6074b0ad" +checksum = "0eec9ac701a9b34a77c8ccbe39d589db876290f6bdc6e05ac118fd114cb1ad26" dependencies = [ "cfg-if", "futures-util", @@ -2198,7 +2168,7 @@ dependencies = [ "resolv-conf", "rustls", "smallvec", - "thiserror", + "thiserror 1.0.68", "tokio", "tokio-native-tls", "tokio-rustls", @@ -2668,7 +2638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d82a8693bd856b8b0596b6abed75d494ba6ca04b8e1b12be3a2ab947c305d8b1" dependencies = [ "miette", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2847,7 +2817,7 @@ dependencies = [ "supports-unicode", "terminal_size", "textwrap", - "thiserror", + "thiserror 1.0.68", "unicode-width", ] @@ -2964,7 +2934,7 @@ dependencies = [ "anyhow", "byteorder", "paste", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -3364,7 +3334,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror", + "thiserror 1.0.68", "tokio", "tracing", ] @@ -3381,7 +3351,7 @@ dependencies = [ "rustc-hash", "rustls", "slab", - "thiserror", + "thiserror 1.0.68", "tinyvec", "tracing", ] @@ -3457,7 +3427,7 @@ dependencies = [ "oem_cp", "oval", "ownable", - "thiserror", + "thiserror 1.0.68", "tracing", "winnow 0.5.40", "zstd", @@ -3501,7 +3471,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -3558,8 +3528,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "h3 0.0.6", - "h3-quinn 0.0.7", + "h3", + "h3-quinn", "http", "http-body", "http-body-util", @@ -3920,7 +3890,7 @@ dependencies = [ "compact_str", "derive_destructure2", "gix", - "thiserror", + "thiserror 1.0.68", "tokio", "tracing", ] @@ -4151,7 +4121,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c1e40dd48a282ae8edc36c732cbc219144b87fb6a4c7316d611c6b1f06ec0c" +dependencies = [ + "thiserror-impl 2.0.1", ] [[package]] @@ -4165,6 +4144,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874aa7e446f1da8d9c3a5c95b1c5eb41d800045252121dc7f8e0ba370cee55f5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thread_local" version = "1.1.8" diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index 43d40065e..d37b036fa 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -27,7 +27,7 @@ binstalk-manifests = { path = "../binstalk-manifests", version = "0.15.8" } clap = { version = "4.5.3", features = ["derive", "env"] } compact_str = "0.8.0" dirs = "5.0.1" -file-format = { version = "0.25.0", default-features = false } +file-format = { version = "0.26.0", default-features = false } home = "0.5.9" log = { version = "0.4.18", features = ["std"] } miette = "7.0.0" diff --git a/crates/binstalk-bins/Cargo.toml b/crates/binstalk-bins/Cargo.toml index ed3852ffa..4c618400f 100644 --- a/crates/binstalk-bins/Cargo.toml +++ b/crates/binstalk-bins/Cargo.toml @@ -17,5 +17,5 @@ compact_str = { version = "0.8.0", features = ["serde"] } leon = "3.0.0" miette = "7.0.0" normalize-path = { version = "0.2.1", path = "../normalize-path" } -thiserror = "1.0.68" +thiserror = "2.0.1" tracing = "0.1.39" diff --git a/crates/binstalk-downloader/Cargo.toml b/crates/binstalk-downloader/Cargo.toml index 33f94dd24..12f37f497 100644 --- a/crates/binstalk-downloader/Cargo.toml +++ b/crates/binstalk-downloader/Cargo.toml @@ -50,7 +50,7 @@ serde_json = { version = "1.0.107", optional = true } #tar = "0.4.38" tar = { package = "binstall-tar", version = "0.4.39" } tempfile = "3.5.0" -thiserror = "1.0.68" +thiserror = "2.0.1" tokio = { version = "1.35.0", features = [ "macros", "rt-multi-thread", @@ -61,7 +61,7 @@ tokio = { version = "1.35.0", features = [ tokio-tar = "0.3.0" tokio-util = { version = "0.7.8", features = ["io"] } tracing = "0.1.39" -hickory-resolver = { version = "0.25.0-alpha.2", optional = true, features = [ +hickory-resolver = { version = "0.25.0-alpha.3", optional = true, features = [ "dnssec-ring", ] } once_cell = { version = "1.18.0", optional = true } diff --git a/crates/binstalk-downloader/src/remote/resolver.rs b/crates/binstalk-downloader/src/remote/resolver.rs index d6b01c8ee..4a7b64bc7 100644 --- a/crates/binstalk-downloader/src/remote/resolver.rs +++ b/crates/binstalk-downloader/src/remote/resolver.rs @@ -9,7 +9,7 @@ use reqwest::dns::{Addrs, Name, Resolve, Resolving}; use tracing::{debug, instrument, warn}; #[cfg(windows)] -use hickory_resolver::config::{NameServerConfig, Protocol}; +use hickory_resolver::{config::NameServerConfig, proto::xfer::Protocol}; type BoxError = Box; @@ -53,6 +53,7 @@ fn get_configs() -> Result<(ResolverConfig, ResolverOpts), BoxError> { #[cfg(feature = "rustls")] tls_config: None, bind_addr: None, + http_endpoint: None, }) } }); diff --git a/crates/binstalk-fetchers/Cargo.toml b/crates/binstalk-fetchers/Cargo.toml index d4a4726f5..1400dd96a 100644 --- a/crates/binstalk-fetchers/Cargo.toml +++ b/crates/binstalk-fetchers/Cargo.toml @@ -25,7 +25,7 @@ miette = "7.0.0" minisign-verify = "0.2.1" once_cell = "1.18.0" strum = "0.26.1" -thiserror = "1.0.68" +thiserror = "2.0.1" tokio = { version = "1.35.0", features = [ "rt", "sync", diff --git a/crates/binstalk-git-repo-api/Cargo.toml b/crates/binstalk-git-repo-api/Cargo.toml index 4b059939b..5f3914700 100644 --- a/crates/binstalk-git-repo-api/Cargo.toml +++ b/crates/binstalk-git-repo-api/Cargo.toml @@ -18,7 +18,7 @@ percent-encoding = "2.2.0" serde = { version = "1.0.163", features = ["derive"] } serde-tuple-vec-map = "1.0.1" serde_json = { version = "1.0.107" } -thiserror = "1.0.68" +thiserror = "2.0.1" tokio = { version = "1.35.0", features = ["sync"], default-features = false } tracing = "0.1.39" url = "2.5.3" diff --git a/crates/binstalk-manifests/Cargo.toml b/crates/binstalk-manifests/Cargo.toml index 7c7e910a9..e95f72ae1 100644 --- a/crates/binstalk-manifests/Cargo.toml +++ b/crates/binstalk-manifests/Cargo.toml @@ -20,7 +20,7 @@ semver = { version = "1.0.17", features = ["serde"] } serde = { version = "1.0.163", features = ["derive"] } serde-tuple-vec-map = "1.0.1" serde_json = "1.0.107" -thiserror = "1.0.68" +thiserror = "2.0.1" toml_edit = { version = "0.22.12", features = ["serde"] } url = { version = "2.5.3", features = ["serde"] } diff --git a/crates/binstalk-registry/Cargo.toml b/crates/binstalk-registry/Cargo.toml index f8260fbd4..36d0fcde6 100644 --- a/crates/binstalk-registry/Cargo.toml +++ b/crates/binstalk-registry/Cargo.toml @@ -29,7 +29,7 @@ serde_json = "1.0.107" sha2 = "0.10.7" simple-git = { version = "0.2.4", optional = true } tempfile = "3.5.0" -thiserror = "1.0.68" +thiserror = "2.0.1" tokio = { version = "1.35.0", features = [ "rt", "sync", diff --git a/crates/binstalk/Cargo.toml b/crates/binstalk/Cargo.toml index 046cfb3a9..bc0a13fff 100644 --- a/crates/binstalk/Cargo.toml +++ b/crates/binstalk/Cargo.toml @@ -35,7 +35,7 @@ simple-git = { version = "0.2.10", optional = true } strum = "0.26.1" target-lexicon = { version = "0.12.11", features = ["std"] } tempfile = "3.5.0" -thiserror = "1.0.68" +thiserror = "2.0.1" tokio = { version = "1.35.0", features = [ "rt", "process", diff --git a/crates/cargo-toml-workspace/Cargo.toml b/crates/cargo-toml-workspace/Cargo.toml index 37dc16b6f..0703faedb 100644 --- a/crates/cargo-toml-workspace/Cargo.toml +++ b/crates/cargo-toml-workspace/Cargo.toml @@ -15,7 +15,7 @@ compact_str = { version = "0.8.0", features = ["serde"] } glob = "0.3.1" normalize-path = { version = "0.2.1", path = "../normalize-path" } serde = "1.0.163" -thiserror = "1.0.68" +thiserror = "2.0.1" tracing = "0.1.39" [dev-dependencies]