chore: reflect to clap updates

Author: weihanglo

Cargo.toml

@@ -68,7 +68,7 @@ toml_edit =  { version = "0.15.0", features = ["serde", "easy", "perf"] }
 unicode-xid = "0.2.0"
 url = "2.2.2"
 walkdir = "2.2"
-clap = "4.0.15"
+clap = "4.1.1"
 unicode-width = "0.1.5"
 openssl = { version = '0.10.11', optional = true }
 im-rc = "15.0.0"

tests/testsuite/cargo_add/dev_build_conflict/stderr.log

@@ -1,7 +1,7 @@
-error: The argument '--dev' cannot be used with '--build'
+error: the argument '--dev' cannot be used with '--build'
 
 Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ...
        cargo add [OPTIONS] --path <PATH> ...
        cargo add [OPTIONS] --git <URL> ...
 
-For more information try '--help'
+For more information, try '--help'.

tests/testsuite/cargo_add/invalid_arg/stderr.log

@@ -1,9 +1,9 @@
-error: Found argument '--flag' which wasn't expected, or isn't valid in this context
+error: unexpected argument '--flag' found
 
-  If you tried to supply '--flag' as a value rather than a flag, use '-- --flag'
+  note: to pass '--flag' as a value, use '-- --flag'
 
 Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ...
        cargo add [OPTIONS] --path <PATH> ...
        cargo add [OPTIONS] --git <URL> ...
 
-For more information try '--help'
+For more information, try '--help'.

tests/testsuite/cargo_add/invalid_target_empty/stderr.log

@@ -1,3 +1,3 @@
-error: The argument '--target <TARGET>' requires a value but none was supplied
+error: a value is required for '--target <TARGET>' but none was supplied
 
-For more information try '--help'
+For more information, try '--help'.

tests/testsuite/cargo_add/no_args/stderr.log

@@ -1,8 +1,8 @@
-error: The following required arguments were not provided:
+error: the following required arguments were not provided:
   <DEP_ID|--path <PATH>|--git <URI>>
 
 Usage: cargo add [OPTIONS] <DEP>[@<VERSION>] ...
        cargo add [OPTIONS] --path <PATH> ...
        cargo add [OPTIONS] --git <URL> ...
 
-For more information try '--help'
+For more information, try '--help'.

tests/testsuite/cargo_remove/invalid_arg/stderr.log

@@ -1,7 +1,7 @@
-error: Found argument '--flag' which wasn't expected, or isn't valid in this context
+error: unexpected argument '--flag' found
 
-  If you tried to supply '--flag' as a value rather than a flag, use '-- --flag'
+  note: to pass '--flag' as a value, use '-- --flag'
 
 Usage: cargo[EXE] remove <DEP_ID>...
 
-For more information try '--help'
+For more information, try '--help'.

tests/testsuite/cargo_remove/no_arg/stderr.log

@@ -1,6 +1,6 @@
-error: The following required arguments were not provided:
+error: the following required arguments were not provided:
   <DEP_ID>...
 
 Usage: cargo[EXE] remove <DEP_ID>...
 
-For more information try '--help'
+For more information, try '--help'.

tests/testsuite/init/unknown_flags/stderr.log

@@ -1,7 +1,7 @@
-error: Found argument '--flag' which wasn't expected, or isn't valid in this context
+error: unexpected argument '--flag' found
 
-  If you tried to supply '--flag' as a value rather than a flag, use '-- --flag'
+  note: to pass '--flag' as a value, use '-- --flag'
 
 Usage: cargo[EXE] init <path>
 
-For more information try '--help'
+For more information, try '--help'.

tests/testsuite/install.rs

@@ -1446,7 +1446,7 @@ fn not_both_vers_and_version() {
         .with_status(1)
         .with_stderr_contains(
             "\
-error: The argument '--version <VERSION>' was provided more than once, but cannot be used multiple times
+[ERROR] the argument '--version <VERSION>' cannot be used multiple times
 ",
         )
         .run();
@@ -1648,9 +1648,7 @@ fn install_empty_argument() {
     cargo_process("install")
         .arg("")
         .with_status(1)
-        .with_stderr_contains(
-            "[ERROR] The argument '[crate]...' requires a value but none was supplied",
-        )
+        .with_stderr_contains("[ERROR] a value is required for '[crate]...' but none was supplied")
         .run();
 }
 

tests/testsuite/login.rs

@@ -133,26 +133,26 @@ fn bad_asymmetric_token_args() {
     // These cases are kept brief as the implementation is covered by clap, so this is only smoke testing that we have clap configured correctly.
     cargo_process("login --key-subject=foo tok")
         .with_stderr_contains(
-            "[ERROR] The argument '--key-subject <SUBJECT>' cannot be used with '[token]'",
+            "error: the argument '--key-subject <SUBJECT>' cannot be used with '[token]'",
         )
         .with_status(1)
         .run();
 
     cargo_process("login --generate-keypair tok")
         .with_stderr_contains(
-            "[ERROR] The argument '--generate-keypair' cannot be used with '[token]'",
+            "error: the argument '--generate-keypair' cannot be used with '[token]'",
         )
         .with_status(1)
         .run();
 
     cargo_process("login --secret-key tok")
-        .with_stderr_contains("[ERROR] The argument '--secret-key' cannot be used with '[token]'")
+        .with_stderr_contains("error: the argument '--secret-key' cannot be used with '[token]'")
         .with_status(1)
         .run();
 
     cargo_process("login --generate-keypair --secret-key")
         .with_stderr_contains(
-            "[ERROR] The argument '--generate-keypair' cannot be used with '--secret-key'",
+            "error: the argument '--generate-keypair' cannot be used with '--secret-key'",
         )
         .with_status(1)
         .run();