Auto merge of #11904 - epage:clap, r=Muscraft

chore: Upgrade to clap v4.2 Tests in `master` are currently failing because its building with clap v4.2 but the tests have snapshots from v4.1
rust-lang · Mar 28, 2023 · a6e1e26 · a6e1e26
2 parents 145219a + 6feea34
commit a6e1e26
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ base64 = "0.21.0"
 bytesize = "1.0"
 cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
 cargo-util = { path = "crates/cargo-util", version = "0.2.4" }
-clap = "4.1.3"
+clap = "4.2.0"
 crates-io = { path = "crates/crates-io", version = "0.36.0" }
 curl = { version = "0.4.44", features = ["http2"] }
 curl-sys = "0.4.61"

diff --git a/tests/testsuite/cargo_add/invalid_arg/stderr.log b/tests/testsuite/cargo_add/invalid_arg/stderr.log
@@ -1,6 +1,6 @@
 error: unexpected argument '--flag' found
 
-  note: argument '--tag' exists
+  tip: a similar argument exists: '--tag'
 
 Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ...
        cargo add [OPTIONS] --path <PATH> ...

diff --git a/tests/testsuite/cargo_remove/invalid_arg/stderr.log b/tests/testsuite/cargo_remove/invalid_arg/stderr.log
@@ -1,6 +1,6 @@
 error: unexpected argument '--flag' found
 
-  note: to pass '--flag' as a value, use '-- --flag'
+  tip: to pass '--flag' as a value, use '-- --flag'
 
 Usage: cargo[EXE] remove <DEP_ID>...
 

diff --git a/tests/testsuite/init/unknown_flags/stderr.log b/tests/testsuite/init/unknown_flags/stderr.log
@@ -1,6 +1,6 @@
 error: unexpected argument '--flag' found
 
-  note: to pass '--flag' as a value, use '-- --flag'
+  tip: to pass '--flag' as a value, use '-- --flag'
 
 Usage: cargo[EXE] init <path>
 

diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs
@@ -592,7 +592,7 @@ fn run_bins() {
             "\
 error: unexpected argument '--bins' found
 
-  note: argument '--bin' exists",
+  tip: a similar argument exists: '--bin'",
         )
         .run();
 }