fix(cli/rustup-mode): make rustup show active-toolchain exit with `…

…1` when none is active
rust-lang · Jan 4, 2025 · d81c19c · d81c19c
1 parent e17902d
commit d81c19c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
@@ -1096,10 +1096,7 @@ fn show_active_toolchain(cfg: &Cfg<'_>, verbose: bool) -> Result<utils::ExitCode
                 )?;
             }
         }
-        None => writeln!(
-            cfg.process.stdout().lock(),
-            "There isn't an active toolchain"
-        )?,
+        None => return Err(anyhow!("there isn't an active toolchain")),
     }
     Ok(utils::ExitCode(0))
 }

diff --git a/tests/suite/cli_rustup.rs b/tests/suite/cli_rustup.rs
@@ -1281,12 +1281,12 @@ async fn show_active_toolchain_with_override() {
 
 #[tokio::test]
 async fn show_active_toolchain_none() {
-    let mut cx = CliTestContext::new(Scenario::None).await;
+    let cx = CliTestContext::new(Scenario::None).await;
     cx.config
-        .expect_ok_ex(
+        .expect_err_ex(
             &["rustup", "show", "active-toolchain"],
-            "There isn't an active toolchain\n",
             "",
+            "error: there isn't an active toolchain\n",
         )
         .await;
 }
@@ -2358,9 +2358,10 @@ async fn override_order() {
     // No default
     cx.config.expect_ok(&["rustup", "default", "none"]).await;
     cx.config
-        .expect_stdout_ok(
+        .expect_err_ex(
             &["rustup", "show", "active-toolchain"],
-            "There isn't an active toolchain\n",
+            "",
+            "error: there isn't an active toolchain\n",
         )
         .await;