fix(cli/rustup-mode): make rustup default exit with 1 when there's no default

Author: rami3l

src/cli/rustup_mode.rs

@@ -753,15 +753,10 @@ async fn default_(
             }
         }
     } else {
-        match cfg.get_default()? {
-            Some(default_toolchain) => {
-                writeln!(cfg.process.stdout().lock(), "{default_toolchain} (default)")?;
-            }
-            None => writeln!(
-                cfg.process.stdout().lock(),
-                "no default toolchain is configured"
-            )?,
-        }
+        let default_toolchain = cfg
+            .get_default()?
+            .ok_or_else(|| anyhow!("no default toolchain is configured"))?;
+        writeln!(cfg.process.stdout().lock(), "{default_toolchain} (default)")?;
     }
 
     Ok(utils::ExitCode(0))

tests/suite/cli_exact.rs

@@ -578,7 +578,7 @@ async fn default_custom_not_installed_toolchain() {
 
 #[tokio::test]
 async fn default_none() {
-    let mut cx = CliTestContext::new(Scenario::None).await;
+    let cx = CliTestContext::new(Scenario::None).await;
     cx.config
         .expect_stderr_ok(
             &["rustup", "default", "none"],
@@ -587,10 +587,10 @@ async fn default_none() {
         .await;
 
     cx.config
-        .expect_ok_ex(
+        .expect_err_ex(
             &["rustup", "default"],
-            "no default toolchain is configured\n",
             "",
+            "error: no default toolchain is configured\n",
         )
         .await;
 

tests/suite/cli_rustup.rs

@@ -2802,7 +2802,11 @@ async fn check_unix_settings_fallback() {
     let cx = CliTestContext::new(Scenario::SimpleV2).await;
     // No default toolchain specified yet
     cx.config
-        .expect_stdout_ok(&["rustup", "default"], "no default toolchain is configured")
+        .expect_err_ex(
+            &["rustup", "default"],
+            "",
+            "error: no default toolchain is configured\n",
+        )
         .await;
 
     // Default toolchain specified in fallback settings file