From 6c0600a031344ee4ad2b94a1295dc2f7e389d0db Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 16 Mar 2023 06:04:03 -0500 Subject: [PATCH 1/2] chore: Fully specify dependencies --- Cargo.lock | 124 +++++++++++++++++++++++------------ Cargo.toml | 14 ++-- clap_bench/Cargo.toml | 2 +- clap_complete/Cargo.toml | 4 +- clap_complete_fig/Cargo.toml | 2 +- clap_derive/Cargo.toml | 2 +- clap_lex/Cargo.toml | 2 +- clap_mangen/Cargo.toml | 2 +- 8 files changed, 95 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5249532a12..d770d89a877 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -23,6 +23,46 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstream" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0982309face56a044e935a18bbffcddeb1ce72e69a3ecc3bafb56d4e959f37" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453bc2a7b261f8c4d1ce5b2c6c222d648d00988d30315e4911fbddc4ddf8983c" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + [[package]] name = "atty" version = "0.2.14" @@ -42,9 +82,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", @@ -228,21 +268,19 @@ dependencies = [ ] [[package]] -name = "concolor" -version = "0.0.11" +name = "concolor-override" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318d6c16e73b3a900eb212ad6a82fc7d298c5ab8184c7a9998646455bc474a16" -dependencies = [ - "bitflags", - "concolor-query", - "is-terminal", -] +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" [[package]] name = "concolor-query" -version = "0.1.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a90734b3d5dcf656e7624cca6bce9c3a90ee11f900e80141a7427ccfb3d317" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] [[package]] name = "criterion" @@ -364,9 +402,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "glob" @@ -403,12 +441,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "humantime" @@ -448,14 +483,14 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -535,9 +570,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -569,9 +604,9 @@ dependencies = [ [[package]] name = "object" -version = "0.29.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] @@ -747,9 +782,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" @@ -826,11 +861,12 @@ checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803" [[package]] name = "snapbox" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c20d8ee8713199cfd44148b70e47cb94f3e8dc538d727d31788f49e67b623e" +checksum = "9615402f9cff539301119bdf2c2f328739cf2b45c2116666618fb6ac399f75bb" dependencies = [ - "concolor", + "anstream", + "anstyle", "escargot", "libc", "normalize-line-endings", @@ -839,14 +875,16 @@ dependencies = [ "snapbox-macros", "wait-timeout", "windows-sys 0.45.0", - "yansi", ] [[package]] name = "snapbox-macros" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "485e65c1203eb37244465e857d15a26d3a85a5410648ccb53b18bd44cb3a7336" +checksum = "f8e40c667388ed1cb5060f545d0013bf0a23efdfa6c5c3e9ef592de391cd860f" +dependencies = [ + "anstream", +] [[package]] name = "static_assertions" @@ -1027,6 +1065,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "version_check" version = "0.9.4" @@ -1237,9 +1281,3 @@ checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" dependencies = [ "memchr", ] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/Cargo.toml b/Cargo.toml index 5b4f9e8c331..e8cdb5b4d41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,23 +101,23 @@ bench = false [dependencies] clap_derive = { path = "./clap_derive", version = "=4.1.8", optional = true } clap_lex = { path = "./clap_lex", version = "0.3.0" } -bitflags = "1.2" -unicase = { version = "2.6", optional = true } -strsim = { version = "0.10", optional = true } +bitflags = "1.2.0" +unicase = { version = "2.6.0", optional = true } +strsim = { version = "0.10.0", optional = true } is-terminal = { version = "0.4.1", optional = true } termcolor = { version = "1.1.1", optional = true } terminal_size = { version = "0.2.1", optional = true } -backtrace = { version = "0.3", optional = true } +backtrace = { version = "0.3.67", optional = true } unicode-width = { version = "0.1.9", optional = true } once_cell = { version = "1.12.0", optional = true } [dev-dependencies] trybuild = "1.0.77" -rustversion = "1" +rustversion = "1.0.12" # Cutting out `filesystem` feature trycmd = { version = "0.14.12", default-features = false, features = ["color-auto", "diff", "examples"] } -humantime = "2" -snapbox = "0.4" +humantime = "2.1.0" +snapbox = "0.4.10" shlex = "1.1.0" static_assertions = "1.1.0" unic-emoji-char = "0.9.0" diff --git a/clap_bench/Cargo.toml b/clap_bench/Cargo.toml index d53d23a36a1..6ea656c92a9 100644 --- a/clap_bench/Cargo.toml +++ b/clap_bench/Cargo.toml @@ -14,7 +14,7 @@ release = false [dev-dependencies] clap = { path = "../", version = "4.0.0", default-features = false, features = ["std", "help"] } criterion = "0.4.0" -lazy_static = "1" +lazy_static = "1.4.0" [[bench]] harness = false diff --git a/clap_complete/Cargo.toml b/clap_complete/Cargo.toml index 6b3098b490a..a667b829e01 100644 --- a/clap_complete/Cargo.toml +++ b/clap_complete/Cargo.toml @@ -35,13 +35,13 @@ bench = false clap = { path = "../", version = "4.1.0", default-features = false, features = ["std"] } clap_lex = { path = "../clap_lex", version = "0.3.0", optional = true } is_executable = { version = "1.0.1", optional = true } -os_str_bytes = { version = "6.0", default-features = false, features = ["raw_os_str"], optional = true } +os_str_bytes = { version = "6.0.0", default-features = false, features = ["raw_os_str"], optional = true } pathdiff = { version = "0.2.1", optional = true } shlex = { version = "1.1.0", optional = true } unicode-xid = { version = "0.2.2", optional = true } [dev-dependencies] -snapbox = { version = "0.4", features = ["diff"] } +snapbox = { version = "0.4.10", features = ["diff"] } # Cutting out `filesystem` feature trycmd = { version = "0.14.12", default-features = false, features = ["color-auto", "diff", "examples"] } clap = { path = "../", version = "4.0.0", default-features = false, features = ["std", "derive", "help"] } diff --git a/clap_complete_fig/Cargo.toml b/clap_complete_fig/Cargo.toml index 89592db2d5a..d3bd20db083 100644 --- a/clap_complete_fig/Cargo.toml +++ b/clap_complete_fig/Cargo.toml @@ -35,5 +35,5 @@ clap = { path = "../", version = "4.0.0", default-features = false, features = [ clap_complete = { path = "../clap_complete", version = "4.0.0" } [dev-dependencies] -snapbox = { version = "0.4", features = ["diff"] } +snapbox = { version = "0.4.10", features = ["diff"] } clap = { path = "../", version = "4.0.0", default-features = false, features = ["std", "help"] } diff --git a/clap_derive/Cargo.toml b/clap_derive/Cargo.toml index a32d8237426..5a6e1257edf 100644 --- a/clap_derive/Cargo.toml +++ b/clap_derive/Cargo.toml @@ -33,7 +33,7 @@ syn = { version = "1.0.74", features = ["full"] } quote = "1.0.9" proc-macro2 = "1.0.42" heck = "0.4.0" -proc-macro-error = "1" +proc-macro-error = "1.0.4" [features] default = [] diff --git a/clap_lex/Cargo.toml b/clap_lex/Cargo.toml index d36c3078146..f05784f9121 100644 --- a/clap_lex/Cargo.toml +++ b/clap_lex/Cargo.toml @@ -30,4 +30,4 @@ pre-release-replacements = [ bench = false [dependencies] -os_str_bytes = { version = "6.0", default-features = false, features = ["raw_os_str"] } +os_str_bytes = { version = "6.0.0", default-features = false, features = ["raw_os_str"] } diff --git a/clap_mangen/Cargo.toml b/clap_mangen/Cargo.toml index 1440d857728..6628d819b75 100644 --- a/clap_mangen/Cargo.toml +++ b/clap_mangen/Cargo.toml @@ -36,7 +36,7 @@ roff = "0.2.1" clap = { path = "../", version = "4.0.0", default-features = false, features = ["std", "env"] } [dev-dependencies] -snapbox = { version = "0.4", features = ["diff"] } +snapbox = { version = "0.4.10", features = ["diff"] } clap = { path = "../", version = "4.0.0", default-features = false, features = ["std", "help"] } [features] From dec82598b2865542f4dd47a7c0de59a2bf6d030e Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 16 Mar 2023 06:05:20 -0500 Subject: [PATCH 2/2] chore: Upgrade trycmd --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- clap_complete/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d770d89a877..a3e88a8d795 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -983,9 +983,9 @@ dependencies = [ [[package]] name = "trycmd" -version = "0.14.12" +version = "0.14.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0347dec81354ddf3c73854d933983ca71f016f1b02c9acc2039dbe3092464f81" +checksum = "32564b3f936a9ebedf5cc07dcf1e7e661204766d35f92c03bf347b099d84e783" dependencies = [ "glob", "humantime", diff --git a/Cargo.toml b/Cargo.toml index e8cdb5b4d41..0a9915d63e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,7 +115,7 @@ once_cell = { version = "1.12.0", optional = true } trybuild = "1.0.77" rustversion = "1.0.12" # Cutting out `filesystem` feature -trycmd = { version = "0.14.12", default-features = false, features = ["color-auto", "diff", "examples"] } +trycmd = { version = "0.14.15", default-features = false, features = ["color-auto", "diff", "examples"] } humantime = "2.1.0" snapbox = "0.4.10" shlex = "1.1.0" diff --git a/clap_complete/Cargo.toml b/clap_complete/Cargo.toml index a667b829e01..2a7c741c6eb 100644 --- a/clap_complete/Cargo.toml +++ b/clap_complete/Cargo.toml @@ -43,7 +43,7 @@ unicode-xid = { version = "0.2.2", optional = true } [dev-dependencies] snapbox = { version = "0.4.10", features = ["diff"] } # Cutting out `filesystem` feature -trycmd = { version = "0.14.12", default-features = false, features = ["color-auto", "diff", "examples"] } +trycmd = { version = "0.14.15", default-features = false, features = ["color-auto", "diff", "examples"] } clap = { path = "../", version = "4.0.0", default-features = false, features = ["std", "derive", "help"] } [[example]]