Merge pull request #1654 from lazorgator/print-default-redux

Bring output of `rustup show active-toolchain` and `rustup default` into line with rest of rustup

Author: kinnison

src/rustup-cli/rustup_mode.rs

@@ -583,17 +583,7 @@ fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
             common::show_channel_update(cfg, toolchain.name(), Ok(status))?;
         }
     } else {
-        let installed_toolchains = cfg.list_toolchains()?;
-        if installed_toolchains.len() > 0 {
-            let default_toolchain = cfg.get_default()?;
-            if default_toolchain != "" {
-                let mut t = term2::stdout();
-                let _ = t.attr(term2::Attr::Bold);
-                let _ = write!(t, "Default toolchain: ");
-                let _ = t.reset();
-                println!("{}", default_toolchain);
-            }
-        }
+        println!("{} (default)", cfg.get_default()?);
     }
 
     Ok(())
@@ -788,8 +778,12 @@ fn show(cfg: &Cfg) -> Result<()> {
 
 fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
     let ref cwd = utils::current_dir()?;
-    if let Some((toolchain, _)) = cfg.find_override_toolchain_or_default(cwd)? {
-        writeln!(term2::stdout(), "{}", toolchain.name())?
+    if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(cwd)? {
+        if reason.is_some() {
+            println!("{} ({})", toolchain.name(), reason.unwrap());
+        } else {
+            println!("{} (default)", toolchain.name());
+        }
     }
     Ok(())
 }

tests/cli-rustup.rs

@@ -861,14 +861,28 @@ fn show_active_toolchain() {
             config,
             &["rustup", "show", "active-toolchain"],
             for_host!(
-                r"nightly-{0}
+                r"nightly-{0} (default)
 "
             ),
             r"",
         );
     });
 }
 
+#[test]
+fn show_active_toolchain_with_override() {
+    setup(&|config| {
+        expect_ok(config, &["rustup", "default", "stable"]);
+        expect_ok(config, &["rustup", "default", "nightly"]);
+        expect_ok(config, &["rustup", "override", "set", "stable"]);
+        expect_stdout_ok(
+            config,
+            &["rustup", "show", "active-toolchain"],
+            for_host!("stable-{0} (directory override for"),
+        );
+    });
+}
+
 #[test]
 fn show_active_toolchain_none() {
     setup(&|config| {