github
/
cranelift
mirror of https://github.com/bytecodealliance/wasmtime.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Enable clap's `wrap_help` feature by default (#9182) 

* Enable clap's `wrap_help` feature by default

This is similar to bytecodealliance/wasm-tools#1746 which makes the help
text easier to read on various terminal widths.

* Fix `cargo deny`
pull/9187/head
Alex Crichton 2 months ago
committed by GitHub
parent
4005a813e8
commit
9160f698c6
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
5 changed files with 103 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 102
      Cargo.lock
  2. 1
      Cargo.toml
  3. 3
      deny.toml
  4. 6
      supply-chain/audits.toml
  5. 21
      supply-chain/imports.lock

102
Cargo.lock
View File

@ -259,7 +259,7 @@ checksum = "769f8cd02eb04d57f14e2e371ebb533f96817f9b2525d73a5c72b61ca7973747"
dependencies = [ dependencies = [
"cap-primitives", "cap-primitives",
"cap-std", "cap-std",
"io-lifetimes", "io-lifetimes 2.0.3",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -271,7 +271,7 @@ checksum = "59ff6d3fb274292a9af283417e383afe6ded1fe66f6472d2c781216d3d80c218"
dependencies = [ dependencies = [
"cap-primitives", "cap-primitives",
"cap-std", "cap-std",
"rustix", "rustix 0.38.31",
"smallvec", "smallvec",
] ]
@ -284,10 +284,10 @@ dependencies = [
"ambient-authority", "ambient-authority",
"fs-set-times", "fs-set-times",
"io-extras", "io-extras",
"io-lifetimes", "io-lifetimes 2.0.3",
"ipnet", "ipnet",
"maybe-owned", "maybe-owned",
"rustix", "rustix 0.38.31",
"windows-sys 0.52.0", "windows-sys 0.52.0",
"winx", "winx",
] ]
@ -310,8 +310,8 @@ checksum = "266626ce180cf9709f317d0bf9754e3a5006359d87f4bf792f06c9c5f1b63c0f"
dependencies = [ dependencies = [
"cap-primitives", "cap-primitives",
"io-extras", "io-extras",
"io-lifetimes", "io-lifetimes 2.0.3",
"rustix", "rustix 0.38.31",
] ]
[[package]] [[package]]
@ -324,7 +324,7 @@ dependencies = [
"cap-primitives", "cap-primitives",
"iana-time-zone", "iana-time-zone",
"once_cell", "once_cell",
"rustix", "rustix 0.38.31",
"winx", "winx",
] ]
@ -441,6 +441,7 @@ dependencies = [
"anstyle", "anstyle",
"clap_lex", "clap_lex",
"strsim", "strsim",
"terminal_size 0.2.6",
] ]
[[package]] [[package]]
@ -531,7 +532,7 @@ dependencies = [
"libc", "libc",
"once_cell", "once_cell",
"regex", "regex",
"terminal_size", "terminal_size 0.1.17",
"unicode-width", "unicode-width",
"winapi", "winapi",
] ]
@ -1152,7 +1153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"rustix", "rustix 0.38.31",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -1225,8 +1226,8 @@ version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb" checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb"
dependencies = [ dependencies = [
"io-lifetimes", "io-lifetimes 2.0.3",
"rustix", "rustix 0.38.31",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -1597,10 +1598,21 @@ version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c301e73fb90e8a29e600a9f402d095765f74310d582916a952f618836a1bd1ed" checksum = "c301e73fb90e8a29e600a9f402d095765f74310d582916a952f618836a1bd1ed"
dependencies = [ dependencies = [
"io-lifetimes", "io-lifetimes 2.0.3",
"windows-sys 0.52.0", "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]] [[package]]
name = "io-lifetimes" name = "io-lifetimes"
version = "2.0.3" version = "2.0.3"
@ -1620,7 +1632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
dependencies = [ dependencies = [
"hermit-abi", "hermit-abi",
"rustix", "rustix 0.38.31",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -1762,6 +1774,12 @@ dependencies = [
"threadpool", "threadpool",
] ]
[[package]]
name = "linux-raw-sys"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.4.12" version = "0.4.12"
@ -1833,7 +1851,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
dependencies = [ dependencies = [
"rustix", "rustix 0.38.31",
] ]
[[package]] [[package]]
@ -2368,6 +2386,20 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" 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]] [[package]]
name = "rustix" name = "rustix"
version = "0.38.31" version = "0.38.31"
@ -2378,7 +2410,7 @@ dependencies = [
"errno", "errno",
"itoa", "itoa",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys 0.4.12",
"once_cell", "once_cell",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -2699,8 +2731,8 @@ dependencies = [
"cap-fs-ext", "cap-fs-ext",
"cap-std", "cap-std",
"fd-lock", "fd-lock",
"io-lifetimes", "io-lifetimes 2.0.3",
"rustix", "rustix 0.38.31",
"windows-sys 0.52.0", "windows-sys 0.52.0",
"winx", "winx",
] ]
@ -2731,7 +2763,7 @@ dependencies = [
"cfg-if", "cfg-if",
"fastrand", "fastrand",
"redox_syscall 0.3.5", "redox_syscall 0.3.5",
"rustix", "rustix 0.38.31",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
@ -2754,6 +2786,16 @@ dependencies = [
"winapi", "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]] [[package]]
name = "test-log" name = "test-log"
version = "0.2.11" version = "0.2.11"
@ -3173,11 +3215,11 @@ dependencies = [
"cap-time-ext", "cap-time-ext",
"fs-set-times", "fs-set-times",
"io-extras", "io-extras",
"io-lifetimes", "io-lifetimes 2.0.3",
"libc", "libc",
"log", "log",
"once_cell", "once_cell",
"rustix", "rustix 0.38.31",
"system-interface", "system-interface",
"tempfile", "tempfile",
"test-log", "test-log",
@ -3465,7 +3507,7 @@ dependencies = [
"psm", "psm",
"rand", "rand",
"rayon", "rayon",
"rustix", "rustix 0.38.31",
"semver", "semver",
"serde", "serde",
"serde_derive", "serde_derive",
@ -3562,7 +3604,7 @@ dependencies = [
"once_cell", "once_cell",
"postcard", "postcard",
"pretty_env_logger", "pretty_env_logger",
"rustix", "rustix 0.38.31",
"serde", "serde",
"serde_derive", "serde_derive",
"sha2", "sha2",
@ -3605,7 +3647,7 @@ dependencies = [
"object", "object",
"once_cell", "once_cell",
"rayon", "rayon",
"rustix", "rustix 0.38.31",
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
@ -3765,7 +3807,7 @@ dependencies = [
"backtrace", "backtrace",
"cc", "cc",
"cfg-if", "cfg-if",
"rustix", "rustix 0.38.31",
"wasmtime-asm-macros", "wasmtime-asm-macros",
"wasmtime-versioned-export-macros", "wasmtime-versioned-export-macros",
"windows-sys 0.52.0", "windows-sys 0.52.0",
@ -3835,7 +3877,7 @@ version = "25.0.0"
dependencies = [ dependencies = [
"object", "object",
"once_cell", "once_cell",
"rustix", "rustix 0.38.31",
"wasmtime-versioned-export-macros", "wasmtime-versioned-export-macros",
] ]
@ -3900,9 +3942,9 @@ dependencies = [
"fs-set-times", "fs-set-times",
"futures", "futures",
"io-extras", "io-extras",
"io-lifetimes", "io-lifetimes 2.0.3",
"once_cell", "once_cell",
"rustix", "rustix 0.38.31",
"system-interface", "system-interface",
"tempfile", "tempfile",
"test-log", "test-log",
@ -4095,7 +4137,7 @@ dependencies = [
"either", "either",
"home", "home",
"once_cell", "once_cell",
"rustix", "rustix 0.38.31",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
@ -4547,8 +4589,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
dependencies = [ dependencies = [
"libc", "libc",
"linux-raw-sys", "linux-raw-sys 0.4.12",
"rustix", "rustix 0.38.31",
] ]
[[package]] [[package]]

1
Cargo.toml
View File

@ -388,6 +388,7 @@ default = [
# cost, so allow disabling this through disabling of our own `default` # cost, so allow disabling this through disabling of our own `default`
# feature. # feature.
"clap/default", "clap/default",
"clap/wrap_help",
] ]
# ======================================== # ========================================

3
deny.toml
View File

@ -62,4 +62,7 @@ skip-tree = [
# criterion is on old version, will update on next release. # criterion is on old version, will update on next release.
{ name = "itertools" }, { name = "itertools" },
# right now terminal_size pulls in an older version of io-lifetimes
{ name = "io-lifetimes" },
] ]

6
supply-chain/audits.toml
View File

@ -2593,6 +2593,12 @@ criteria = "safe-to-deploy"
delta = "3.5.0 -> 3.6.0" delta = "3.5.0 -> 3.6.0"
notes = "Dependency updates and new optimized trait implementations, but otherwise everything looks normal." notes = "Dependency updates and new optimized trait implementations, but otherwise everything looks normal."
[[audits.terminal_size]]
who = "Alex Crichton <alex@alexcrichton.com>"
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]] [[audits.test-log]]
who = "Pat Hickey <phickey@fastly.com>" who = "Pat Hickey <phickey@fastly.com>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"

21
supply-chain/imports.lock
View File

@ -752,6 +752,13 @@ user-id = 6825
user-login = "sunfishcode" user-login = "sunfishcode"
user-name = "Dan Gohman" 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]] [[publisher.io-lifetimes]]
version = "2.0.3" version = "2.0.3"
when = "2023-12-01" when = "2023-12-01"
@ -787,6 +794,13 @@ user-id = 2915
user-login = "Amanieu" user-login = "Amanieu"
user-name = "Amanieu d'Antras" 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]] [[publisher.linux-raw-sys]]
version = "0.4.12" version = "0.4.12"
when = "2023-11-30" when = "2023-11-30"
@ -878,6 +892,13 @@ user-id = 189
user-login = "BurntSushi" user-login = "BurntSushi"
user-name = "Andrew Gallant" 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]] [[publisher.rustix]]
version = "0.38.31" version = "0.38.31"
when = "2024-02-01" when = "2024-02-01"

Write Preview
Loading…
Cancel
Save