Expand rustup show

Now it shows the active toolchain, the installed targets for the active toolchain, and the installed toolchains. When there are no additional toolchains or targets, the category headers for them are not displayed.
rust-lang · May 7, 2016 · e9ea918 · e9ea918
1 parent 10f4581
commit e9ea918
Show file tree

Hide file tree

Showing 4 changed files with 170 additions and 19 deletions.
diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs
@@ -212,7 +212,7 @@ pub fn update_all_channels(cfg: &Cfg, self_update: bool) -> Result<()> {
     Ok(())
 }
 
-fn rustc_version(toolchain: &Toolchain) -> String {
+pub fn rustc_version(toolchain: &Toolchain) -> String {
     if toolchain.exists() {
         let rustc_path = toolchain.binary_file("rustc");
         if utils::is_file(&rustc_path) {
@@ -293,7 +293,7 @@ pub fn list_targets(toolchain: &Toolchain) -> Result<()> {
 }
 
 pub fn list_toolchains(cfg: &Cfg) -> Result<()> {
-    let mut toolchains = try!(cfg.list_toolchains());
+    let toolchains = try!(cfg.list_toolchains());
 
     if toolchains.is_empty() {
         println!("no installed toolchains");

diff --git a/src/rustup-cli/rustup_mode.rs b/src/rustup-cli/rustup_mode.rs
@@ -8,6 +8,9 @@ use rustup_dist::dist::TargetTriple;
 use rustup_utils::utils;
 use self_update;
 use std::path::Path;
+use std::iter;
+use term2;
+use std::io::Write;
 
 pub fn main() -> Result<()> {
     try!(::self_update::cleanup_self_updater());
@@ -276,19 +279,82 @@ fn which(cfg: &Cfg, m: &ArgMatches) -> Result<()> {
 
 fn show(cfg: &Cfg) -> Result<()> {
     let ref cwd = try!(utils::current_dir());
-    let override_ = try!(cfg.find_override(cwd));
-    if let Some((toolchain, reason)) = override_ {
-        println!("{} ({})", toolchain.name(), reason);
-        return Ok(());
+    let installed_toolchains = try!(cfg.list_toolchains());
+    let active_toolchain = try!(cfg.find_override_toolchain_or_default(cwd));
+    let active_targets = if let Some((ref t, _)) = active_toolchain {
+        try!(t.list_components())
+            .into_iter()
+            .filter(|c| c.component.pkg == "rust-std")
+            .filter(|c| c.installed)
+            .collect()
+    } else {
+        vec![]
+    };
+
+    let show_installed_toolchains = installed_toolchains.len() > 1;
+    let show_active_targets = active_targets.len() > 1;
+    let show_active_toolchain = true;
+
+    // Only need to display headers if we have multiple sections
+    let show_headers = [
+        show_installed_toolchains,
+        show_active_targets,
+        show_active_toolchain
+    ].iter().filter(|x| **x).count() > 1;
+
+    if show_installed_toolchains {
+        if show_headers { print_header("installed toolchains") }
+        let default = try!(cfg.find_default());
+        let default_name = default.map(|t| t.name().to_string())
+                           .unwrap_or("".into());
+        for t in installed_toolchains {
+            if default_name == t {
+                println!("{} (default)", t);
+            } else {
+                println!("{}", t);
+            }
+        }
+        if show_headers { println!("") };
     }
 
-    let toolchain = try!(cfg.find_default());
-    if let Some(toolchain) = toolchain {
-        println!("{} (default toolchain)", toolchain.name());
-        return Ok(());
+    if show_active_targets {
+        if show_headers {
+            print_header("installed targets for active toolchain");
+        }
+        for t in active_targets {
+            println!("{}", t.component.target);
+        }
+        if show_headers { println!("") };
     }
 
-    println!("no active toolchain");
+    if show_active_toolchain {
+        if show_headers { print_header("active toolchain") }
+
+        match active_toolchain {
+            Some((ref toolchain, Some(ref reason))) => {
+                println!("{} ({})", toolchain.name(), reason);
+                println!("{}", common::rustc_version(toolchain));
+            }
+            Some((ref toolchain, None)) => {
+                println!("{} (default)", toolchain.name());
+                println!("{}", common::rustc_version(toolchain));
+            }
+            None => {
+                println!("no active toolchain");
+            }
+        }
+
+        if show_headers { println!("") };
+    }
+
+    fn print_header(s: &str) {
+        let mut t = term2::stdout();
+        let _ = t.attr(term2::Attr::Bold);
+        let _ = writeln!(t, "{}", s);
+        let _ = writeln!(t, "{}", iter::repeat("-").take(s.len()).collect::<String>());
+        let _ = writeln!(t, "");
+        let _ = t.reset();
+    }
 
     Ok(())
 }

diff --git a/src/rustup-utils/src/utils.rs b/src/rustup-utils/src/utils.rs
@@ -492,7 +492,7 @@ pub fn string_from_winreg_value(val: &winreg::RegValue) -> Option<String> {
 }
 
 pub fn toolchain_sort<T: AsRef<str>>(v: &mut Vec<T>) {
-    fn channel_sort_key(s: &str) -> String {
+    fn toolchain_sort_key(s: &str) -> String {
         if s.starts_with("stable") {
             format!("0{}", s)
         } else if s.starts_with("beta") {
@@ -507,8 +507,8 @@ pub fn toolchain_sort<T: AsRef<str>>(v: &mut Vec<T>) {
     v.sort_by(|a, b| {
         let a_str: &str = a.as_ref();
         let b_str: &str = b.as_ref();
-        let a_key = channel_sort_key(a_str);
-        let b_key = channel_sort_key(b_str);
+        let a_key = toolchain_sort_key(a_str);
+        let b_key = toolchain_sort_key(b_str);
         a_key.cmp(&b_key)
     });
 }
diff --git a/tests/cli-rustup.rs b/tests/cli-rustup.rs
@@ -278,12 +278,92 @@ fn show_toolchain_default() {
     setup(&|config| {
         expect_ok(config, &["rustup", "default", "nightly"]);
         expect_ok_ex(config, &["rustup", "show"],
-for_host!(r"nightly-{0} (default toolchain)
+for_host!(r"nightly-{0} (default)
+1.3.0 (hash-n-2)
+"),
+r"");
+    });
+}
+
+#[test]
+fn show_multiple_toolchains() {
+    setup(&|config| {
+        expect_ok(config, &["rustup", "default", "nightly"]);
+        expect_ok(config, &["rustup", "update", "stable"]);
+        expect_ok_ex(config, &["rustup", "show"],
+for_host!(r"installed toolchains
+--------------------
+
+stable-{0}
+nightly-{0} (default)
+
+active toolchain
+----------------
+
+nightly-{0} (default)
+1.3.0 (hash-n-2)
+
 "),
 r"");
     });
 }
 
+#[test]
+fn show_multiple_targets() {
+    clitools::setup(Scenario::MultiHost, &|config| {
+        expect_ok(config, &["rustup", "default",
+                            &format!("nightly-{}", clitools::MULTI_ARCH1)]);
+        expect_ok(config, &["rustup", "target", "add", clitools::CROSS_ARCH2]);
+        expect_ok_ex(config, &["rustup", "show"],
+&format!(r"installed targets for active toolchain
+--------------------------------------
+
+{1}
+{0}
+
+active toolchain
+----------------
+
+nightly-{0} (default)
+1.3.0 (xxxx-n-2)
+
+", clitools::MULTI_ARCH1, clitools::CROSS_ARCH2),
+r"");
+    });
+}
+
+#[test]
+fn show_multiple_toolchains_and_targets() {
+    clitools::setup(Scenario::MultiHost, &|config| {
+        expect_ok(config, &["rustup", "default",
+                            &format!("nightly-{}", clitools::MULTI_ARCH1)]);
+        expect_ok(config, &["rustup", "target", "add", clitools::CROSS_ARCH2]);
+        expect_ok(config, &["rustup", "update",
+                            &format!("stable-{}", clitools::MULTI_ARCH1)]);
+        expect_ok_ex(config, &["rustup", "show"],
+&format!(r"installed toolchains
+--------------------
+
+stable-{0}
+nightly-{0} (default)
+
+installed targets for active toolchain
+--------------------------------------
+
+{1}
+{0}
+
+active toolchain
+----------------
+
+nightly-{0} (default)
+1.3.0 (xxxx-n-2)
+
+", clitools::MULTI_ARCH1, clitools::CROSS_ARCH2),
+r"");
+    });
+}
+
 #[test]
 fn list_default_toolchain() {
     setup(&|config| {
@@ -296,14 +376,17 @@ r"");
 }
 
 #[test]
-#[ignore(windows)] // FIXME rustup displays UNC paths
 fn show_toolchain_override() {
+    // FIXME rustup displays UNC paths
+    if cfg!(windows) { return }
+
     setup(&|config| {
         let cwd = ::std::env::current_dir().unwrap();
         expect_ok(config, &["rustup", "override", "add", "nightly"]);
         expect_ok_ex(config, &["rustup", "show"],
-&format!(r"nightly (directory override for '{}')
-", cwd.display()),
+&format!(r"nightly-{} (directory override for '{}')
+1.3.0 (hash-n-2)
+", this_host_triple(), cwd.display()),
 r"");
     });
 }
@@ -330,7 +413,9 @@ fn show_toolchain_env() {
         let out = cmd.output().unwrap();
         assert!(out.status.success());
         let stdout = String::from_utf8(out.stdout).unwrap();
-        assert!(&stdout == for_host!("nightly-{0} (environment override by RUSTUP_TOOLCHAIN)\n"));
+        assert!(&stdout == for_host!(r"nightly-{0} (environment override by RUSTUP_TOOLCHAIN)
+1.3.0 (hash-n-2)
+"));
     });
 }