diff --git a/Cargo.lock b/Cargo.lock index a2b0e899973..1a8928bad03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -765,12 +765,12 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.32" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" dependencies = [ "bitflags", - "clap_derive 4.0.21", + "clap_derive 4.1.0", "clap_lex 0.3.0", "is-terminal", "once_cell", @@ -793,9 +793,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -2027,7 +2027,7 @@ name = "gateway-cli" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.0.32", + "clap 4.1.1", "futures", "gateway-client", "libc", @@ -2586,7 +2586,7 @@ dependencies = [ "buf-list", "bytes", "camino", - "clap 4.0.32", + "clap 4.1.1", "ddm-admin-client", "display-error-chain", "futures", @@ -2624,7 +2624,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "clap 4.0.32", + "clap 4.1.1", "dropshot", "expectorate", "hyper", @@ -2654,7 +2654,7 @@ name = "internal-dns" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.0.32", + "clap 4.1.1", "dropshot", "expectorate", "internal-dns-client", @@ -3441,7 +3441,7 @@ name = "omicron-deploy" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.0.32", + "clap 4.1.1", "crossbeam", "omicron-package", "omicron-sled-agent", @@ -3458,7 +3458,7 @@ name = "omicron-gateway" version = "0.1.0" dependencies = [ "async-trait", - "clap 4.0.32", + "clap 4.1.1", "dropshot", "expectorate", "futures", @@ -3500,7 +3500,7 @@ dependencies = [ "base64 0.20.0", "bb8", "chrono", - "clap 4.0.32", + "clap 4.1.1", "cookie", "criterion", "crucible-agent-client", @@ -3586,7 +3586,7 @@ name = "omicron-package" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.0.32", + "clap 4.1.1", "futures", "hex", "indicatif", @@ -3624,7 +3624,7 @@ dependencies = [ "bytes", "cfg-if 1.0.0", "chrono", - "clap 4.0.32", + "clap 4.1.1", "crucible-agent-client", "crucible-client-types", "ddm-admin-client", @@ -3684,7 +3684,7 @@ name = "omicron-test-utils" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.0.32", + "clap 4.1.1", "dropshot", "expectorate", "futures", @@ -3944,7 +3944,7 @@ dependencies = [ name = "oximeter-collector" version = "0.1.0" dependencies = [ - "clap 4.0.32", + "clap 4.1.1", "dropshot", "expectorate", "internal-dns-client", @@ -3975,7 +3975,7 @@ dependencies = [ "async-trait", "bytes", "chrono", - "clap 4.0.32", + "clap 4.1.1", "dropshot", "itertools", "omicron-test-utils", @@ -4564,7 +4564,7 @@ version = "0.2.1-dev" source = "git+https://github.com/oxidecomputer/progenitor?branch=main#634bf98b053cc494191365e2072b3580f4b03df6" dependencies = [ "anyhow", - "clap 4.0.32", + "clap 4.1.1", "openapiv3", "progenitor-client", "progenitor-impl", @@ -5911,7 +5911,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "clap 4.0.32", + "clap 4.1.1", "dropshot", "futures", "gateway-messages", @@ -7138,7 +7138,7 @@ dependencies = [ "anyhow", "assert_cmd", "camino", - "clap 4.0.32", + "clap 4.1.1", "crossterm", "futures", "hex", @@ -7168,7 +7168,7 @@ dependencies = [ "async-trait", "buf-list", "bytes", - "clap 4.0.32", + "clap 4.1.1", "debug-ignore", "dropshot", "expectorate", diff --git a/Cargo.toml b/Cargo.toml index 98882ce81a5..d9c51df37e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,7 +102,7 @@ bytes = "1.3.0" camino = "1.1" cfg-if = "1.0" chrono = { version = "0.4", features = [ "serde" ] } -clap = { version = "4.0", features = ["derive"] } +clap = { version = "4.1", features = ["derive"] } cookie = "0.16" criterion = { version = "0.4", features = [ "async_tokio" ] } crossbeam = "0.8" diff --git a/nexus/tests/output/cmd-nexus-noargs-stderr b/nexus/tests/output/cmd-nexus-noargs-stderr index ac203ced652..f371553325d 100644 --- a/nexus/tests/output/cmd-nexus-noargs-stderr +++ b/nexus/tests/output/cmd-nexus-noargs-stderr @@ -1,6 +1,6 @@ -error: The following required arguments were not provided: +error: the following required arguments were not provided: Usage: nexus -For more information try '--help' +For more information, try '--help'. diff --git a/oximeter/collector/tests/output/cmd-oximeter-noargs-stderr b/oximeter/collector/tests/output/cmd-oximeter-noargs-stderr index d2609b1ec05..7b736fe8a12 100644 --- a/oximeter/collector/tests/output/cmd-oximeter-noargs-stderr +++ b/oximeter/collector/tests/output/cmd-oximeter-noargs-stderr @@ -8,4 +8,4 @@ Commands: help Print this message or the help of the given subcommand(s) Options: - -h, --help Print help information + -h, --help Print help diff --git a/sled-agent/tests/output/cmd-sled-agent-noargs-stderr b/sled-agent/tests/output/cmd-sled-agent-noargs-stderr index 48fb7910c3d..ee397c0ef7c 100644 --- a/sled-agent/tests/output/cmd-sled-agent-noargs-stderr +++ b/sled-agent/tests/output/cmd-sled-agent-noargs-stderr @@ -8,5 +8,5 @@ Commands: help Print this message or the help of the given subcommand(s) Options: - -h, --help Print help information - -V, --version Print version information + -h, --help Print help + -V, --version Print version diff --git a/sled-agent/tests/output/cmd-sled-agent-sim-noargs-stderr b/sled-agent/tests/output/cmd-sled-agent-sim-noargs-stderr index 3d9c4ccce1f..9aee5c4e5ad 100644 --- a/sled-agent/tests/output/cmd-sled-agent-sim-noargs-stderr +++ b/sled-agent/tests/output/cmd-sled-agent-sim-noargs-stderr @@ -1,8 +1,8 @@ -error: The following required arguments were not provided: +error: the following required arguments were not provided: Usage: sled-agent-sim -For more information try '--help' +For more information, try '--help'. diff --git a/test-utils/tests/output/cmd-omicron-dev-bad-cmd-stderr b/test-utils/tests/output/cmd-omicron-dev-bad-cmd-stderr index d92b0477463..b18526db3aa 100644 --- a/test-utils/tests/output/cmd-omicron-dev-bad-cmd-stderr +++ b/test-utils/tests/output/cmd-omicron-dev-bad-cmd-stderr @@ -1,5 +1,5 @@ -error: The subcommand 'bogus-command' wasn't recognized +error: unrecognized subcommand 'bogus-command' Usage: omicron-dev -For more information try '--help' +For more information, try '--help'. diff --git a/test-utils/tests/output/cmd-omicron-dev-db-populate-noargs-stderr b/test-utils/tests/output/cmd-omicron-dev-db-populate-noargs-stderr index e049ed5bfcc..f8276da1688 100644 --- a/test-utils/tests/output/cmd-omicron-dev-db-populate-noargs-stderr +++ b/test-utils/tests/output/cmd-omicron-dev-db-populate-noargs-stderr @@ -1,6 +1,6 @@ -error: The following required arguments were not provided: +error: the following required arguments were not provided: --database-url Usage: omicron-dev db-populate --database-url -For more information try '--help' +For more information, try '--help'. diff --git a/test-utils/tests/output/cmd-omicron-dev-db-wipe-noargs-stderr b/test-utils/tests/output/cmd-omicron-dev-db-wipe-noargs-stderr index 8f9d2531a65..6c8af1aa471 100644 --- a/test-utils/tests/output/cmd-omicron-dev-db-wipe-noargs-stderr +++ b/test-utils/tests/output/cmd-omicron-dev-db-wipe-noargs-stderr @@ -1,6 +1,6 @@ -error: The following required arguments were not provided: +error: the following required arguments were not provided: --database-url Usage: omicron-dev db-wipe --database-url -For more information try '--help' +For more information, try '--help'. diff --git a/test-utils/tests/output/cmd-omicron-dev-noargs-stderr b/test-utils/tests/output/cmd-omicron-dev-noargs-stderr index d57c75b30ea..6573c3ff777 100644 --- a/test-utils/tests/output/cmd-omicron-dev-noargs-stderr +++ b/test-utils/tests/output/cmd-omicron-dev-noargs-stderr @@ -10,5 +10,5 @@ Commands: help Print this message or the help of the given subcommand(s) Options: - -h, --help Print help information - -V, --version Print version information + -h, --help Print help + -V, --version Print version