cli: add rustup self uninstall --no-modify-path

Author: cyqsimon

src/cli/rustup_mode.rs

@@ -532,8 +532,13 @@ enum SelfSubcmd {
 
     /// Uninstall rustup
     Uninstall {
+        /// Continue without confirmation
         #[arg(short = 'y')]
         no_prompt: bool,
+
+        /// Do not clean up the `PATH` environment variable
+        #[arg(long)]
+        no_modify_path: bool,
     },
 
     /// Upgrade the internal data format
@@ -726,7 +731,10 @@ pub async fn main(
         RustupSubcmd::Man { command, toolchain } => man(cfg, &command, toolchain).await,
         RustupSubcmd::Self_ { subcmd } => match subcmd {
             SelfSubcmd::Update => self_update::update(cfg).await,
-            SelfSubcmd::Uninstall { no_prompt } => self_update::uninstall(no_prompt, process),
+            SelfSubcmd::Uninstall {
+                no_prompt,
+                no_modify_path,
+            } => self_update::uninstall(no_prompt, no_modify_path, process),
             SelfSubcmd::UpgradeData => cfg.upgrade_data().map(|_| ExitCode(0)),
         },
         RustupSubcmd::Set { subcmd } => match subcmd {

src/cli/self_update.rs

@@ -474,6 +474,17 @@ This will uninstall all Rust toolchains and data, and remove
     };
 }
 
+macro_rules! pre_uninstall_msg_no_modify_path {
+    () => {
+        r"# Thanks for hacking in Rust!
+
+This will uninstall all Rust toolchains and data.
+Your `PATH` environment variable will not be touched.
+
+"
+    };
+}
+
 static DEFAULT_UPDATE_ROOT: &str = "https://static.rust-lang.org/rustup";
 
 fn update_root(process: &Process) -> String {
@@ -968,7 +979,11 @@ async fn maybe_install_rust(opts: InstallOpts<'_>, cfg: &mut Cfg<'_>) -> Result<
     Ok(())
 }
 
-pub(crate) fn uninstall(no_prompt: bool, process: &Process) -> Result<utils::ExitCode> {
+pub(crate) fn uninstall(
+    no_prompt: bool,
+    no_modify_path: bool,
+    process: &Process,
+) -> Result<utils::ExitCode> {
     if cfg!(feature = "no-self-update") {
         error!("self-uninstall is disabled for this build of rustup");
         error!("you should probably use your system package manager to uninstall rustup");
@@ -983,10 +998,14 @@ pub(crate) fn uninstall(no_prompt: bool, process: &Process) -> Result<utils::Exi
 
     if !no_prompt {
         writeln!(process.stdout().lock())?;
-        let msg = format!(
-            pre_uninstall_msg!(),
-            cargo_home = canonical_cargo_home(process)?
-        );
+        let msg = if no_modify_path {
+            pre_uninstall_msg_no_modify_path!().to_owned()
+        } else {
+            format!(
+                pre_uninstall_msg!(),
+                cargo_home = canonical_cargo_home(process)?
+            )
+        };
         md(&mut process.stdout(), msg);
         if !common::confirm("\nContinue? (y/N)", false, process)? {
             info!("aborting uninstallation");
@@ -1005,7 +1024,9 @@ pub(crate) fn uninstall(no_prompt: bool, process: &Process) -> Result<utils::Exi
     info!("removing cargo home");
 
     // Remove CARGO_HOME/bin from PATH
-    do_remove_from_path(process)?;
+    if !no_modify_path {
+        do_remove_from_path(process)?;
+    }
 
     // Delete everything in CARGO_HOME *except* the rustup bin
 

tests/suite/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml

@@ -7,7 +7,8 @@ Uninstall rustup
 Usage: rustup[EXE] self uninstall [OPTIONS]
 
 Options:
-  -y          
-  -h, --help  Print help
+  -y                    Continue without confirmation
+      --no-modify-path  Do not clean up the `PATH` environment variable
+  -h, --help            Print help
 """
 stderr = ""