feat(cli/rustup-mode)!: simplify error message for `rustup show activ…

…e-toolchain`
rust-lang · Jan 6, 2025 · 84adf47 · 84adf47
1 parent ba1eff9
commit 84adf47
Show file tree

Hide file tree

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

diff --git a/tests/suite/cli_rustup.rs b/tests/suite/cli_rustup.rs
@@ -1286,7 +1286,7 @@ async fn show_active_toolchain_none() {
         .expect_err_ex(
             &["rustup", "show", "active-toolchain"],
             "",
-            "error: there isn't an active toolchain\n",
+            "error: no active toolchain\n",
         )
         .await;
 }
@@ -2361,7 +2361,7 @@ async fn override_order() {
         .expect_err_ex(
             &["rustup", "show", "active-toolchain"],
             "",
-            "error: there isn't an active toolchain\n",
+            "error: no active toolchain\n",
         )
         .await;
-Original file line number
+Diff line change
@@ Expand Up @@
                     )?;
                 }
             }
-            None => return Err(anyhow!("there isn't an active toolchain")),
+            None => return Err(anyhow!("no active toolchain")),
         }
         Ok(utils::ExitCode(0))
     }
@@ Expand Down @@