diff --git a/Cargo.lock b/Cargo.lock index 7415893b26..764f9d0c05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -259,7 +259,7 @@ checksum = "769f8cd02eb04d57f14e2e371ebb533f96817f9b2525d73a5c72b61ca7973747" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes", + "io-lifetimes 2.0.3", "windows-sys 0.52.0", ] @@ -271,7 +271,7 @@ checksum = "59ff6d3fb274292a9af283417e383afe6ded1fe66f6472d2c781216d3d80c218" dependencies = [ "cap-primitives", "cap-std", - "rustix", + "rustix 0.38.31", "smallvec", ] @@ -284,10 +284,10 @@ dependencies = [ "ambient-authority", "fs-set-times", "io-extras", - "io-lifetimes", + "io-lifetimes 2.0.3", "ipnet", "maybe-owned", - "rustix", + "rustix 0.38.31", "windows-sys 0.52.0", "winx", ] @@ -310,8 +310,8 @@ checksum = "266626ce180cf9709f317d0bf9754e3a5006359d87f4bf792f06c9c5f1b63c0f" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes", - "rustix", + "io-lifetimes 2.0.3", + "rustix 0.38.31", ] [[package]] @@ -324,7 +324,7 @@ dependencies = [ "cap-primitives", "iana-time-zone", "once_cell", - "rustix", + "rustix 0.38.31", "winx", ] @@ -441,6 +441,7 @@ dependencies = [ "anstyle", "clap_lex", "strsim", + "terminal_size 0.2.6", ] [[package]] @@ -531,7 +532,7 @@ dependencies = [ "libc", "once_cell", "regex", - "terminal_size", + "terminal_size 0.1.17", "unicode-width", "winapi", ] @@ -1152,7 +1153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ "cfg-if", - "rustix", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -1225,8 +1226,8 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb" dependencies = [ - "io-lifetimes", - "rustix", + "io-lifetimes 2.0.3", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -1597,10 +1598,21 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c301e73fb90e8a29e600a9f402d095765f74310d582916a952f618836a1bd1ed" dependencies = [ - "io-lifetimes", + "io-lifetimes 2.0.3", "windows-sys 0.52.0", ] +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "io-lifetimes" version = "2.0.3" @@ -1620,7 +1632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", - "rustix", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -1762,6 +1774,12 @@ dependencies = [ "threadpool", ] +[[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.12" @@ -1833,7 +1851,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix", + "rustix 0.38.31", ] [[package]] @@ -2368,6 +2386,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + [[package]] name = "rustix" version = "0.38.31" @@ -2378,7 +2410,7 @@ dependencies = [ "errno", "itoa", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.12", "once_cell", "windows-sys 0.52.0", ] @@ -2699,8 +2731,8 @@ dependencies = [ "cap-fs-ext", "cap-std", "fd-lock", - "io-lifetimes", - "rustix", + "io-lifetimes 2.0.3", + "rustix 0.38.31", "windows-sys 0.52.0", "winx", ] @@ -2731,7 +2763,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -2754,6 +2786,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "terminal_size" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +dependencies = [ + "rustix 0.37.27", + "windows-sys 0.48.0", +] + [[package]] name = "test-log" version = "0.2.11" @@ -3173,11 +3215,11 @@ dependencies = [ "cap-time-ext", "fs-set-times", "io-extras", - "io-lifetimes", + "io-lifetimes 2.0.3", "libc", "log", "once_cell", - "rustix", + "rustix 0.38.31", "system-interface", "tempfile", "test-log", @@ -3465,7 +3507,7 @@ dependencies = [ "psm", "rand", "rayon", - "rustix", + "rustix 0.38.31", "semver", "serde", "serde_derive", @@ -3562,7 +3604,7 @@ dependencies = [ "once_cell", "postcard", "pretty_env_logger", - "rustix", + "rustix 0.38.31", "serde", "serde_derive", "sha2", @@ -3605,7 +3647,7 @@ dependencies = [ "object", "once_cell", "rayon", - "rustix", + "rustix 0.38.31", "serde", "serde_derive", "serde_json", @@ -3765,7 +3807,7 @@ dependencies = [ "backtrace", "cc", "cfg-if", - "rustix", + "rustix 0.38.31", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", "windows-sys 0.52.0", @@ -3835,7 +3877,7 @@ version = "25.0.0" dependencies = [ "object", "once_cell", - "rustix", + "rustix 0.38.31", "wasmtime-versioned-export-macros", ] @@ -3900,9 +3942,9 @@ dependencies = [ "fs-set-times", "futures", "io-extras", - "io-lifetimes", + "io-lifetimes 2.0.3", "once_cell", - "rustix", + "rustix 0.38.31", "system-interface", "tempfile", "test-log", @@ -4095,7 +4137,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -4547,8 +4589,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys", - "rustix", + "linux-raw-sys 0.4.12", + "rustix 0.38.31", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 8b7711f2ec..89e720681c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -388,6 +388,7 @@ default = [ # cost, so allow disabling this through disabling of our own `default` # feature. "clap/default", + "clap/wrap_help", ] # ======================================== diff --git a/deny.toml b/deny.toml index e9f09df26c..1ecdf0cbea 100644 --- a/deny.toml +++ b/deny.toml @@ -62,4 +62,7 @@ skip-tree = [ # criterion is on old version, will update on next release. { name = "itertools" }, + + # right now terminal_size pulls in an older version of io-lifetimes + { name = "io-lifetimes" }, ] diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index c5008b5d59..312abdbb9d 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -2593,6 +2593,12 @@ criteria = "safe-to-deploy" delta = "3.5.0 -> 3.6.0" notes = "Dependency updates and new optimized trait implementations, but otherwise everything looks normal." +[[audits.terminal_size]] +who = "Alex Crichton " +criteria = "safe-to-deploy" +delta = "0.1.17 -> 0.2.6" +notes = "Minor updates around using some utilities from the standard library, nothing major." + [[audits.test-log]] who = "Pat Hickey " criteria = "safe-to-deploy" diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 77e71d88b2..e1f81c5009 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -752,6 +752,13 @@ user-id = 6825 user-login = "sunfishcode" user-name = "Dan Gohman" +[[publisher.io-lifetimes]] +version = "1.0.11" +when = "2023-05-24" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.io-lifetimes]] version = "2.0.3" when = "2023-12-01" @@ -787,6 +794,13 @@ user-id = 2915 user-login = "Amanieu" user-name = "Amanieu d'Antras" +[[publisher.linux-raw-sys]] +version = "0.3.8" +when = "2023-05-19" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.linux-raw-sys]] version = "0.4.12" when = "2023-11-30" @@ -878,6 +892,13 @@ user-id = 189 user-login = "BurntSushi" user-name = "Andrew Gallant" +[[publisher.rustix]] +version = "0.37.27" +when = "2023-10-26" +user-id = 6825 +user-login = "sunfishcode" +user-name = "Dan Gohman" + [[publisher.rustix]] version = "0.38.31" when = "2024-02-01"