diff --git a/Cargo.lock b/Cargo.lock index ea2d633dd2e..0979c198469 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,9 +87,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" @@ -306,7 +306,7 @@ dependencies = [ "cargo-platform", "cargo-util", "cargo-util-schemas", - "clap 4.5.11", + "clap 4.5.22", "color-print", "crates-io", "curl", @@ -370,7 +370,7 @@ version = "0.1.0" dependencies = [ "anyhow", "cargo", - "clap 3.2.25", + "clap 4.5.22", "color-eyre", "diffus", "either", @@ -436,7 +436,7 @@ version = "0.1.0" dependencies = [ "ahash", "camino", - "clap 3.2.25", + "clap 4.5.22", "color-eyre", "dialoguer", "guppy", @@ -455,7 +455,7 @@ version = "0.9.33" dependencies = [ "camino", "cfg-if", - "clap 4.5.11", + "clap 4.5.22", "color-eyre", "dialoguer", "duct", @@ -601,69 +601,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" +version = "4.5.22" 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.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" +checksum = "69371e34337c4c984bbe322360c2547210bf632eb2814bbe78a6e87a2935bd2b" dependencies = [ "clap_builder", - "clap_derive 4.5.11", + "clap_derive", ] [[package]] name = "clap_builder" -version = "4.5.11" +version = "4.5.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" +checksum = "6e24c1b4099818523236a8ca881d2b45db98dadfb4625cf6608c12069fcbbde1" dependencies = [ "anstream", "anstyle", - "clap_lex 0.7.2", + "clap_lex", "strsim 0.11.1", "terminal_size", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.5.18" 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.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -671,15 +641,6 @@ dependencies = [ "syn 2.0.90", ] -[[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.7.2" @@ -808,7 +769,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.11", + "clap 4.5.22", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1253,7 +1214,7 @@ version = "0.1.0" dependencies = [ "anyhow", "camino", - "clap 2.34.0", + "clap 4.5.22", "fixtures", "guppy", "guppy-cmdlib", @@ -2203,7 +2164,7 @@ dependencies = [ name = "guppy-cmdlib" version = "0.1.0" dependencies = [ - "clap 3.2.25", + "clap 4.5.22", "color-eyre", "guppy", "guppy-workspace-hack", @@ -2232,7 +2193,7 @@ name = "guppy-workspace-hack" version = "0.1.0" dependencies = [ "aho-corasick", - "clap 4.5.11", + "clap 4.5.22", "clap_builder", "getrandom", "indexmap 1.9.3", @@ -2331,12 +2292,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -2621,7 +2576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.0", + "windows-targets 0.48.5", ] [[package]] @@ -2950,12 +2905,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "overload" version = "0.1.1" @@ -3708,12 +3657,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -3857,23 +3800,14 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "terminal_size" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" dependencies = [ "rustix", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3918,12 +3852,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.69" @@ -4454,7 +4382,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4474,17 +4411,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4501,9 +4439,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4519,9 +4457,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4537,9 +4475,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4555,9 +4499,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4573,9 +4517,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4591,9 +4535,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4609,9 +4553,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" diff --git a/cargo-guppy/Cargo.toml b/cargo-guppy/Cargo.toml index 5499c0f39e1..27510e720bc 100644 --- a/cargo-guppy/Cargo.toml +++ b/cargo-guppy/Cargo.toml @@ -10,7 +10,7 @@ ahash.workspace = true camino = "1.1.9" # disable tracing integration since we don't use it color-eyre = { version = "0.6.3", default-features = false } -clap = { version = "3.2.25", features = ["derive"] } +clap = { version = "4.5.22", features = ["derive"] } dialoguer = "0.11.0" guppy = { version = "0.17.10", path = "../guppy", features = ["summaries"] } guppy-cmdlib = { path = "../guppy-cmdlib" } diff --git a/guppy-cmdlib/Cargo.toml b/guppy-cmdlib/Cargo.toml index cfd59c7cbb8..bd01f48eb61 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.5.22", features = ["derive"] } color-eyre = { version = "0.6.3", default-features = false } guppy = { path = "../guppy" } proptest = { version = "1.5.0", optional = true } diff --git a/internal-tools/cargo-compare/Cargo.toml b/internal-tools/cargo-compare/Cargo.toml index ccf5ff541ea..a5d44fb4fa5 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.94" cargo = { version = "0.82.0", features = ["vendored-libgit2"] } -clap = { version = "3.2.25", features = ["derive"] } +clap = { version = "4.5.22", features = ["derive"] } color-eyre = { version = "0.6.3", default-features = false } diffus = "0.10.0" either = "1.11.0" diff --git a/internal-tools/fixture-manager/Cargo.toml b/internal-tools/fixture-manager/Cargo.toml index ecf3e8e964b..891011d97f4 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.94" camino = "1.1.9" -clap = "2.34.0" +clap = "4.5.22" 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 7ae4070c3e9..9c8a5ec9339 100644 --- a/tools/cargo-hakari/Cargo.toml +++ b/tools/cargo-hakari/Cargo.toml @@ -20,7 +20,7 @@ rust-version.workspace = true [dependencies] camino = "1.1.9" cfg-if = "1.0.0" -clap = { version = "4.3.19", features = ["derive"] } +clap = { version = "4.5.22", features = ["derive"] } # disable tracing integration since we don't use it color-eyre = { version = "0.6.3", default-features = false } dialoguer = "0.11.0" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 240a558af34..52b634ecd56 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -18,10 +18,9 @@ edition = "2021" ### BEGIN HAKARI SECTION [dependencies] aho-corasick = { version = "1.1.2" } -clap = { version = "4.5.11", features = ["derive"] } -clap_builder = { version = "4.5.11", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] } +clap = { version = "4.5.22", features = ["derive"] } +clap_builder = { version = "4.5.22", default-features = false, features = ["color", "help", "std", "suggestions", "usage"] } getrandom = { version = "0.2.12", default-features = false, features = ["std"] } -indexmap = { version = "1.9.3", default-features = false, features = ["std"] } log = { version = "0.4.22", default-features = false, features = ["std"] } num-traits = { version = "0.2.17", features = ["libm"] } owo-colors = { version = "3.5.0", default-features = false, features = ["supports-colors"] }