Improve "rustup show" output order

Author: majaha

src/cli/rustup_mode.rs

@@ -1115,8 +1115,8 @@ fn show(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
     };
 
     let show_installed_toolchains = installed_toolchains.len() > 1;
-    let show_active_targets = active_targets.len() > 1;
     let show_active_toolchain = true;
+    let show_active_targets = active_targets.len() > 1;
 
     // Only need to display headers if we have multiple sections
     let show_headers = [
@@ -1158,26 +1158,6 @@ fn show(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
         };
     }
 
-    if show_active_targets {
-        let mut t = term2::stdout();
-        if show_headers {
-            print_header::<Error>(&mut t, "installed targets for active toolchain")?;
-        }
-        for at in active_targets {
-            writeln!(
-                t,
-                "{}",
-                at.component
-                    .target
-                    .as_ref()
-                    .expect("rust-std should have a target")
-            )?;
-        }
-        if show_headers {
-            writeln!(t)?;
-        };
-    }
-
     if show_active_toolchain {
         let mut t = term2::stdout();
         if show_headers {
@@ -1214,6 +1194,26 @@ fn show(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
         }
     }
 
+    if show_active_targets {
+        let mut t = term2::stdout();
+        if show_headers {
+            print_header::<Error>(&mut t, "installed targets for active toolchain")?;
+        }
+        for at in active_targets {
+            writeln!(
+                t,
+                "{}",
+                at.component
+                    .target
+                    .as_ref()
+                    .expect("rust-std should have a target")
+            )?;
+        }
+        if show_headers {
+            writeln!(t)?;
+        };
+    }
+
     fn print_header<E>(t: &mut term2::StdoutTerminal, s: &str) -> std::result::Result<(), E>
     where
         E: From<term::Error> + From<std::io::Error>,

tests/cli-rustup.rs

@@ -617,18 +617,18 @@ fn show_multiple_targets() {
                 r"Default host: {2}
 rustup home:  {3}
 
-installed targets for active toolchain
---------------------------------------
-
-{1}
-{0}
-
 active toolchain
 ----------------
 
 nightly-{0} (default)
 1.3.0 (xxxx-nightly-2)
 
+installed targets for active toolchain
+--------------------------------------
+
+{1}
+{0}
+
 ",
                 clitools::MULTI_ARCH1,
                 clitools::CROSS_ARCH2,
@@ -670,18 +670,18 @@ installed toolchains
 stable-{0}
 nightly-{0} (default)
 
-installed targets for active toolchain
---------------------------------------
-
-{1}
-{0}
-
 active toolchain
 ----------------
 
 nightly-{0} (default)
 1.3.0 (xxxx-nightly-2)
 
+installed targets for active toolchain
+--------------------------------------
+
+{1}
+{0}
+
 ",
                 clitools::MULTI_ARCH1,
                 clitools::CROSS_ARCH2,