From 9665334c6497f4fe99dd2307d6a692d35b1ba747 Mon Sep 17 00:00:00 2001 From: akabinds Date: Tue, 2 Aug 2022 10:46:03 -0500 Subject: [PATCH] improve error message for when subcommand contains `+toolchain` --- src/bin/cargo/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/cargo/main.rs b/src/bin/cargo/main.rs index f4e2c8298..d0775423b 100644 --- a/src/bin/cargo/main.rs +++ b/src/bin/cargo/main.rs @@ -168,8 +168,9 @@ fn execute_external_subcommand(config: &Config, cmd: &str, args: &[&str]) -> Cli None => { let suggestions = list_commands(config); let did_you_mean = closest_msg(cmd, suggestions.keys(), |c| c); + let err = if cmd.contains('+') { - anyhow::format_err!("no such subcommand: `{}`{}\n\n\tCargo does not handle `+toolchain` directives.\n\tsuggestion: view a list of all installed Cargo subcommands using `cargo --list`", cmd, did_you_mean) + anyhow::format_err!("no such subcommand: `{}`{}\n\n\tCargo does not handle `+toolchain` directives itself.\n\tDid you mean to run `cargo` through `rustup` instead?\n\tsuggestion: view a list of all installed Cargo subcommands using `cargo --list`", cmd, did_you_mean) } else { anyhow::format_err!("no such subcommand: `{}`{}\n\n\tsuggestion: view a list of all installed Cargo subcommands using `cargo --list`", cmd, did_you_mean) };