diff --git a/Cargo.lock b/Cargo.lock index 0a644f747615..17262f974698 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,16 +55,15 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] @@ -94,9 +93,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -126,7 +125,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" dependencies = [ - "rustix 0.38.21", + "rustix", "tempfile", "windows-sys 0.48.0", ] @@ -296,7 +295,7 @@ dependencies = [ "bytesize", "cargo-platform", "cargo-util", - "clap 4.3.19", + "clap 4.4.7", "crates-io", "curl", "curl-sys", @@ -359,7 +358,7 @@ version = "0.1.0" dependencies = [ "anyhow", "cargo", - "clap 3.2.25", + "clap 4.4.7", "color-eyre", "diffus", "either", @@ -378,7 +377,7 @@ name = "cargo-guppy" version = "0.1.0" dependencies = [ "camino", - "clap 3.2.25", + "clap 4.4.7", "color-eyre", "dialoguer", "guppy", @@ -397,7 +396,7 @@ version = "0.9.28" dependencies = [ "camino", "cfg-if", - "clap 4.3.19", + "clap 4.4.7", "color-eyre", "dialoguer", "duct", @@ -525,70 +524,39 @@ dependencies = [ "atty", "bitflags 1.3.2", "strsim 0.8.0", - "textwrap 0.11.0", + "textwrap", "unicode-width", "vec_map", ] [[package]] name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive 3.2.25", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - -[[package]] -name = "clap" -version = "4.3.19" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", - "clap_derive 4.3.12", - "once_cell", + "clap_derive", ] [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.0", + "clap_lex", "strsim 0.10.0", "terminal_size", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" -dependencies = [ - "heck 0.4.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "clap_derive" -version = "4.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -598,18 +566,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clru" @@ -712,7 +671,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.3.19", + "clap 4.4.7", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1111,7 +1070,7 @@ version = "0.1.0" dependencies = [ "anyhow", "camino", - "clap 2.34.0", + "clap 4.4.7", "fixtures", "guppy", "guppy-cmdlib", @@ -1671,7 +1630,7 @@ dependencies = [ "gix-command", "gix-config-value", "parking_lot", - "rustix 0.38.21", + "rustix", "thiserror", ] @@ -1960,7 +1919,7 @@ dependencies = [ name = "guppy-cmdlib" version = "0.1.0" dependencies = [ - "clap 3.2.25", + "clap 4.4.7", "color-eyre", "guppy", "guppy-workspace-hack", @@ -1987,7 +1946,7 @@ dependencies = [ name = "guppy-workspace-hack" version = "0.1.0" dependencies = [ - "clap 4.3.19", + "clap 4.4.7", "clap_builder", "indexmap 1.9.3", "libc", @@ -2000,7 +1959,7 @@ dependencies = [ "quote", "regex", "regex-automata", - "rustix 0.38.21", + "rustix", "semver", "serde", "serde_json", @@ -2249,17 +2208,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "is-terminal" version = "0.4.9" @@ -2267,7 +2215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.21", + "rustix", "windows-sys 0.48.0", ] @@ -2402,12 +2350,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.10" @@ -2656,12 +2598,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - [[package]] name = "overload" version = "0.1.1" @@ -3111,20 +3047,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.21" @@ -3134,7 +3056,7 @@ dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.10", + "linux-raw-sys", "windows-sys 0.48.0", ] @@ -3526,7 +3448,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.4.1", - "rustix 0.38.21", + "rustix", "windows-sys 0.48.0", ] @@ -3541,11 +3463,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.37.23", + "rustix", "windows-sys 0.48.0", ] @@ -3593,12 +3515,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.44" diff --git a/cargo-guppy/Cargo.toml b/cargo-guppy/Cargo.toml index 6733e395e656..77df6dacfc71 100644 --- a/cargo-guppy/Cargo.toml +++ b/cargo-guppy/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" camino = "1.1.6" # disable tracing integration since we don't use it color-eyre = { version = "0.6.2", default-features = false } -clap = { version = "3.2.25", features = ["derive"] } +clap = { version = "4.4.7", features = ["derive"] } dialoguer = "0.10.4" guppy = { version = "0.17.1", path = "../guppy", features = ["summaries"] } guppy-cmdlib = { path = "../guppy-cmdlib" } diff --git a/guppy-cmdlib/Cargo.toml b/guppy-cmdlib/Cargo.toml index 05594c543857..8bf69a1c601c 100644 --- a/guppy-cmdlib/Cargo.toml +++ b/guppy-cmdlib/Cargo.toml @@ -10,7 +10,7 @@ publish = false [dependencies] # disable tracing integration since we don't use it -clap = { version = "3.2.25", features = ["derive"] } +clap = { version = "4.4.7", features = ["derive"] } color-eyre = { version = "0.6.2", default-features = false } guppy = { path = "../guppy" } proptest = { version = "1.2.0", optional = true } diff --git a/internal-tools/cargo-compare/Cargo.toml b/internal-tools/cargo-compare/Cargo.toml index 354e8f99bc09..9926fd80dd77 100644 --- a/internal-tools/cargo-compare/Cargo.toml +++ b/internal-tools/cargo-compare/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] anyhow = "1.0.75" cargo = "0.73.1" -clap = { version = "3.2.25", features = ["derive"] } +clap = { version = "4.4.7", features = ["derive"] } color-eyre = { version = "0.6.2", default-features = false } diffus = "0.10.0" either = "1.9.0" diff --git a/internal-tools/fixture-manager/Cargo.toml b/internal-tools/fixture-manager/Cargo.toml index fadfe87c8695..2dd9c34d4642 100644 --- a/internal-tools/fixture-manager/Cargo.toml +++ b/internal-tools/fixture-manager/Cargo.toml @@ -10,7 +10,7 @@ publish = false [dependencies] anyhow = "1.0.75" camino = "1.1.6" -clap = "2.34.0" +clap = "4.4.7" guppy = { path = "../../guppy", features = ["proptest1", "summaries"] } guppy-cmdlib = { path = "../../guppy-cmdlib", features = ["proptest1"] } fixtures = { path = "../../fixtures" } diff --git a/tools/cargo-hakari/Cargo.toml b/tools/cargo-hakari/Cargo.toml index 696245a54e4d..184b963c9d5c 100644 --- a/tools/cargo-hakari/Cargo.toml +++ b/tools/cargo-hakari/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.70" [dependencies] camino = "1.1.6" cfg-if = "1.0.0" -clap = { version = "4.3.19", features = ["derive"] } +clap = { version = "4.4.7", features = ["derive"] } # disable tracing integration since we don't use it color-eyre = { version = "0.6.2", default-features = false } dialoguer = "0.10.4" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 20bd2ee77fe9..8109ee63bdd8 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -16,9 +16,8 @@ repository = "https://github.com/guppy-rs/guppy" ### BEGIN HAKARI SECTION [dependencies] -clap = { version = "4.3.19", features = ["derive"] } -clap_builder = { version = "4.3.19", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] } -indexmap = { version = "1.9.3", default-features = false, features = ["std"] } +clap = { version = "4.4.7", features = ["derive"] } +clap_builder = { version = "4.4.7", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] } libc = { version = "0.2.149" } log = { version = "0.4.20", default-features = false, features = ["std"] } memchr = { version = "2.5.0" }