refactor(cli): remove deprecated()

Author: rami3l

src/cli/rustup_mode.rs

@@ -46,7 +46,7 @@ use crate::{
         toolchain::Toolchain,
     },
     utils::utils,
-    Cfg, Notification,
+    Cfg,
 };
 
 const TOOLCHAIN_OVERRIDE_ERROR: &str =
@@ -68,25 +68,6 @@ fn handle_epipe(res: Result<utils::ExitCode>) -> Result<utils::ExitCode> {
     }
 }
 
-fn deprecated<F, B, R>(instead: &str, cfg: &mut Cfg, matches: B, callee: F) -> R
-where
-    F: FnOnce(&mut Cfg, B) -> R,
-{
-    (cfg.notify_handler)(Notification::PlainVerboseMessage(
-        "Use of (currently) unmaintained command line interface.",
-    ));
-    (cfg.notify_handler)(Notification::PlainVerboseMessage(
-        "The exact API of this command may change without warning",
-    ));
-    (cfg.notify_handler)(Notification::PlainVerboseMessage(
-        "Eventually this command will be a true alias.  Until then:",
-    ));
-    (cfg.notify_handler)(Notification::PlainVerboseMessage(&format!(
-        "  Please use `rustup {instead}` instead"
-    )));
-    callee(cfg, matches)
-}
-
 #[derive(Debug, Parser)]
 #[command(
     name = "rustup",
@@ -217,10 +198,10 @@ pub fn main() -> Result<utils::ExitCode> {
         Some(s) => match s {
             ("dump-testament", _) => common::dump_testament()?,
             ("show", _) => Rustup::from_arg_matches(&matches)?.dispatch(cfg)?,
-            ("install", m) => deprecated("toolchain install", cfg, m, update)?,
+            ("install", m) => update(cfg, m)?,
             ("update", m) => update(cfg, m)?,
             ("check", _) => check_updates(cfg)?,
-            ("uninstall", m) => deprecated("toolchain uninstall", cfg, m, toolchain_remove)?,
+            ("uninstall", m) => toolchain_remove(cfg, m)?,
             ("default", m) => default_(cfg, m)?,
             ("toolchain", c) => match c.subcommand() {
                 Some(s) => match s {

src/notifications.rs

@@ -31,7 +31,6 @@ pub(crate) enum Notification<'a> {
     ReadMetadataVersion(&'a str),
     NonFatalError(&'a anyhow::Error),
     UpgradeRemovesToolchains,
-    PlainVerboseMessage(&'a str),
     /// Both `rust-toolchain` and `rust-toolchain.toml` exist within a directory
     DuplicateToolchainFile {
         rust_toolchain: &'a Path,
@@ -68,7 +67,6 @@ impl<'a> Notification<'a> {
             | UpdatingToolchain(_)
             | ReadMetadataVersion(_)
             | InstalledToolchain(_)
-            | PlainVerboseMessage(_)
             | UpdateHashMatches => NotificationLevel::Verbose,
             SetDefaultToolchain(_)
             | SetOverrideToolchain(_, _)
@@ -124,7 +122,6 @@ impl<'a> Display for Notification<'a> {
                 f,
                 "this upgrade will remove all existing toolchains. you will need to reinstall them"
             ),
-            PlainVerboseMessage(r) => write!(f, "{r}"),
             DuplicateToolchainFile {
                 rust_toolchain,
                 rust_toolchain_toml,

tests/suite/cli_misc.rs

@@ -1021,29 +1021,3 @@ fn toolchain_link_then_list_verbose() {
         config.expect_stdout_ok(&["rustup", "toolchain", "list", "-v"], "/custom-1");
     });
 }
-
-#[test]
-fn deprecated_interfaces() {
-    setup(&|config| {
-        // In verbose mode we want the deprecated interfaces to complain
-        config.expect_ok_contains(
-            &["rustup", "--verbose", "install", "nightly"],
-            "",
-            "Please use `rustup toolchain install` instead",
-        );
-        config.expect_ok_contains(
-            &["rustup", "--verbose", "uninstall", "nightly"],
-            "",
-            "Please use `rustup toolchain uninstall` instead",
-        );
-        // But if not verbose then they should *NOT* complain
-        config.expect_not_stderr_ok(
-            &["rustup", "install", "nightly"],
-            "Please use `rustup toolchain install` instead",
-        );
-        config.expect_not_stderr_ok(
-            &["rustup", "uninstall", "nightly"],
-            "Please use `rustup toolchain uninstall` instead",
-        );
-    })
-}