Add release channel & --toolchain support to rustup which

Update "which" test

Author: BeniCheni

src/cli/rustup_mode.rs

@@ -32,6 +32,16 @@ pub fn main() -> Result<()> {
     let matches = cli().get_matches();
     let verbose = matches.is_present("verbose");
     let quiet = matches.is_present("quiet");
+
+    let toolchain = if let Some(channel) = matches.value_of("toolchain-keyword") {
+        if matches.is_present("toolchain-option") {
+            warn_toolchain_keyword_option();
+        }
+        &channel[1..]
+    } else {
+        matches.value_of("toolchain-option").unwrap_or("")
+    };
+
     let cfg = &common::set_globals(verbose, quiet)?;
 
     if maybe_upgrade_data(cfg, &matches)? {
@@ -79,7 +89,7 @@ pub fn main() -> Result<()> {
             (_, _) => unreachable!(),
         },
         ("run", Some(m)) => run(cfg, m)?,
-        ("which", Some(m)) => which(cfg, m)?,
+        ("which", Some(m)) => which(cfg, m, toolchain)?,
         ("doc", Some(m)) => doc(cfg, m)?,
         ("man", Some(m)) => man(cfg, m)?,
         ("self", Some(c)) => match c.subcommand() {
@@ -130,11 +140,15 @@ pub fn cli() -> App<'static, 'static> {
                 .long("quiet"),
         )
         .arg(
-            Arg::with_name("toolchain")
+            Arg::with_name("toolchain-option")
                 .help(TOOLCHAIN_ARG_HELP)
                 .long("toolchain")
                 .takes_value(true),
         )
+        .arg(
+            Arg::with_name("toolchain-keyword")
+                .help("provide the release channel (e.g. +stable) or custom toolchain"),
+        )
         .subcommand(
             SubCommand::with_name("dump-testament")
                 .about("Dump information about the build")
@@ -475,7 +489,7 @@ pub fn cli() -> App<'static, 'static> {
                 .about("Display which binary will be run for a given command")
                 .arg(Arg::with_name("command").required(true))
                 .arg(
-                    Arg::with_name("toolchain")
+                    Arg::with_name("toolchain-option")
                         .help(TOOLCHAIN_ARG_HELP)
                         .long("toolchain")
                         .takes_value(true),
@@ -817,11 +831,16 @@ fn run(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
     process::exit(c)
 }
 
-fn which(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
+fn which(cfg: &Cfg, m: &ArgMatches<'_>, toolchain_by_root_cmd: &str) -> Result<()> {
     let binary = m.value_of("command").expect("");
-    let toolchain_provided = m.is_present("toolchain");
-    let binary_path = if toolchain_provided {
-        let toolchain = m.value_of("toolchain").expect("");
+    let binary_path = if !toolchain_by_root_cmd.is_empty() {
+        if m.is_present("toolchain-option") {
+            warn_toolchain_keyword_option();
+        }
+        cfg.which_binary_by_toolchain(toolchain_by_root_cmd, binary)?
+            .expect("binary not found")
+    } else if m.is_present("toolchain-option") {
+        let toolchain = m.value_of("toolchain-option").expect("");
         cfg.which_binary_by_toolchain(toolchain, binary)?
             .expect("binary not found")
     } else {
@@ -1378,3 +1397,10 @@ fn output_completion_script(shell: Shell, command: CompletionCommand) -> Result<
 
     Ok(())
 }
+
+fn warn_toolchain_keyword_option() {
+    warn!(
+        "Both the toolchain keyword (e.g. \"+nightly\" or custom toolchain) and the \"--toolchain\" option are provided.\n\
+        The toolchain keyword would take precedence over the \"--toolchain\" option.",
+    );
+}

tests/cli-misc.rs

@@ -866,8 +866,8 @@ fn add_remove_component() {
 #[test]
 fn which() {
     setup(&|config| {
-        let path_1 = config.customdir.join("custom-1");
-        let path_1 = path_1.to_string_lossy();
+        let _path_1 = config.customdir.join("custom-1");
+        let path_1 = _path_1.to_string_lossy();
         expect_ok(
             config,
             &["rustup", "toolchain", "link", "custom-1", &path_1],
@@ -885,8 +885,8 @@ fn which() {
             &["rustup", "which", "rustc"],
             "/toolchains/custom-1/bin/rustc",
         );
-        let path_2 = config.customdir.join("custom-2");
-        let path_2 = path_2.to_string_lossy();
+        let _path_2 = config.customdir.join("custom-2");
+        let path_2 = _path_2.to_string_lossy();
         expect_ok(
             config,
             &["rustup", "toolchain", "link", "custom-2", &path_2],
@@ -903,5 +903,85 @@ fn which() {
             &["rustup", "which", "--toolchain=custom-2", "rustc"],
             "/toolchains/custom-2/bin/rustc",
         );
+        #[cfg(windows)]
+        expect_stdout_ok(
+            config,
+            &["rustup", "--toolchain=custom-2", "which", "rustc"],
+            "\\toolchains\\custom-2\\bin\\rustc",
+        );
+        #[cfg(not(windows))]
+        expect_stdout_ok(
+            config,
+            &["rustup", "--toolchain=custom-2", "which", "rustc"],
+            "/toolchains/custom-2/bin/rustc",
+        );
+        expect_ok(config, &["rustup", "default", "stable"]);
+        #[cfg(windows)]
+        expect_stdout_ok(
+            config,
+            &["rustup", "+stable", "which", "rustc"],
+            "\\toolchains\\stable-x86_64-",
+        );
+        #[cfg(windows)]
+        expect_stdout_ok(
+            config,
+            &["rustup", "+stable", "which", "rustc"],
+            "\\bin\\rustc",
+        );
+        #[cfg(not(windows))]
+        expect_stdout_ok(
+            config,
+            &["rustup", "+stable", "which", "rustc"],
+            "/toolchains/stable-x86_64-",
+        );
+        #[cfg(not(windows))]
+        expect_stdout_ok(
+            config,
+            &["rustup", "+stable", "which", "rustc"],
+            "/bin/rustc",
+        );
+        expect_ok(config, &["rustup", "default", "nightly"]);
+        #[cfg(windows)]
+        expect_stdout_ok(
+            config,
+            &["rustup", "+nightly", "which", "rustc"],
+            "\\toolchains\\nightly-x86_64-",
+        );
+        #[cfg(windows)]
+        expect_stdout_ok(
+            config,
+            &["rustup", "+nightly", "which", "rustc"],
+            "\\bin\\rustc",
+        );
+        #[cfg(not(windows))]
+        expect_stdout_ok(
+            config,
+            &["rustup", "+nightly", "which", "rustc"],
+            "/toolchains/nightly-x86_64-",
+        );
+        #[cfg(not(windows))]
+        expect_stdout_ok(
+            config,
+            &["rustup", "+nightly", "which", "rustc"],
+            "/bin/rustc",
+        );
+
+        expect_err(
+            config,
+            &["rustup", "+foo", "which", "rustc"],
+            "binary not found",
+        );
+        const WHICH_SUBCOMMAND_WARNING: &str = "warning: Both the toolchain keyword (e.g. \"+nightly\" or custom toolchain) and the \"--toolchain\" option are provided.\n\
+            The toolchain keyword would take precedence over the \"--toolchain\" option.";
+        expect_stderr_ok(
+            config,
+            &["rustup", "+nightly", "--toolchain=stable", "which", "cargo"],
+            WHICH_SUBCOMMAND_WARNING,
+        );
+        expect_stderr_ok(
+            config,
+            &["rustup", "+nightly", "which", "cargo", "--toolchain=stable"],
+            WHICH_SUBCOMMAND_WARNING,
+        );
     });
 }