Merge pull request #1633 from lazorgator/1632-rustup-print-default

Print default toolchain on `rustup default` without arguments
rust-lang · Feb 11, 2019 · 194026d · 194026d
2 parents 2ba84ae + ec7b52f
commit 194026d
Showing 1 changed file with 30 additions and 16 deletions.
diff --git a/src/rustup-cli/rustup_mode.rs b/src/rustup-cli/rustup_mode.rs
@@ -189,7 +189,7 @@ pub fn cli() -> App<'static, 'static> {
                 .arg(
                     Arg::with_name("toolchain")
                         .help(TOOLCHAIN_ARG_HELP)
-                        .required(true),
+                        .required(false),
                 ),
         )
         .subcommand(
@@ -572,23 +572,37 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 }
 
 fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
-    let ref toolchain = m.value_of("toolchain").expect("");
-    default_bare_triple_check(cfg, toolchain)?;
-    let ref toolchain = cfg.get_toolchain(toolchain, false)?;
-
-    let status = if !toolchain.is_custom() {
-        Some(toolchain.install_from_dist_if_not_installed()?)
-    } else if !toolchain.exists() {
-        return Err(ErrorKind::ToolchainNotInstalled(toolchain.name().to_string()).into());
-    } else {
-        None
-    };
+    if m.is_present("toolchain") {
+        let ref toolchain = m.value_of("toolchain").expect("");
+        default_bare_triple_check(cfg, toolchain)?;
+        let ref toolchain = cfg.get_toolchain(toolchain, false)?;
+
+        let status = if !toolchain.is_custom() {
+            Some(toolchain.install_from_dist_if_not_installed()?)
+        } else if !toolchain.exists() {
+            return Err(ErrorKind::ToolchainNotInstalled(toolchain.name().to_string()).into());
+        } else {
+            None
+        };
 
-    toolchain.make_default()?;
+        toolchain.make_default()?;
 
-    if let Some(status) = status {
-        println!();
-        common::show_channel_update(cfg, toolchain.name(), Ok(status))?;
+        if let Some(status) = status {
+            println!();
+            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);
+            }
+        }
     }
 
     Ok(())