Auto merge of #10336 - weihanglo:bump-clap, r=ehuss

Bump clap to v3.0.13
rust-lang · Jan 27, 2022 · 0673982 · 0673982
2 parents 1c03475 + 11c5041
commit 0673982
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,7 +61,7 @@ toml_edit =  { version = "0.13", features = ["serde", "easy"] }
 unicode-xid = "0.2.0"
 url = "2.2.2"
 walkdir = "2.2"
-clap = "3.0.5"
+clap = "3.0.13"
 unicode-width = "0.1.5"
 openssl = { version = '0.10.11', optional = true }
 im-rc = "15.0.0"

diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs
@@ -1251,7 +1251,7 @@ fn run_multiple_packages() {
 
     cargo().arg("-p").arg("d1").arg("-p").arg("d2")
                     .with_status(1)
-                    .with_stderr_contains("error: The argument '--package <SPEC>...' was provided more than once, but cannot be used multiple times").run();
+                    .with_stderr_contains("error: The argument '--package [<SPEC>...]' was provided more than once, but cannot be used multiple times").run();
 
     cargo()
         .arg("-p")

diff --git a/tests/testsuite/rustc.rs b/tests/testsuite/rustc.rs
@@ -540,7 +540,7 @@ fn fail_with_multiple_packages() {
         .with_status(1)
         .with_stderr_contains(
             "\
-error: The argument '--package <SPEC>...' was provided more than once, \
+error: The argument '--package [<SPEC>...]' was provided more than once, \
        but cannot be used multiple times
 ",
         )