implement test checking if stderr, after using `+toolchain`, contains message stating...

diff --git a/src/bin/cargo/main.rs b/src/bin/cargo/main.rs
index d09ce74a78aff926df8afbda9de04d9c593cfef1..a29b77b3cdfc37caa08df0619a652375a190e06a 100644 (file)
--- a/src/bin/cargo/main.rs
+++ b/src/bin/cargo/main.rs
@@ -170,7 +170,7 @@ fn execute_external_subcommand(config: &Config, cmd: &str, args: &[&str]) -> Cli
                 anyhow::format_err!(
                     "no such subcommand: `{}`\n\n\t\
                     Cargo does not handle `+toolchain` directives.\n\t\
-                    Did you mean to run `cargo` through `rustup` instead?",
+                    Did you mean to invoke `cargo` through `rustup` instead?",
                     cmd
                 )
             } else {

diff --git a/tests/testsuite/cargo_command.rs b/tests/testsuite/cargo_command.rs
index 8db1c4c7ebdc70fe574625fd6eb113b9e84d2fa6..4bdb71bed2b2f8dc02acdccd927a68ab42020a0e 100644 (file)
--- a/tests/testsuite/cargo_command.rs
+++ b/tests/testsuite/cargo_command.rs
@@ -386,3 +386,14 @@ fn closed_output_ok() {
     assert!(status.success());
     assert!(s.is_empty(), "{}", s);
 }
+
+#[cargo_test]
+fn subcommand_leading_plus_output_contains() {
+    cargo_process("+nightly")
+        .with_status(101)
+        .with_stderr_contains(
+            "\
+<tab>Cargo does not handle `+toolchain` directives.",
+        )
+        .run();
+}