uninstalls toolchains prior to deleting the rustup home folder

Author: Darunada

Diff for: src/cli/rustup_mode.rs

@@ -179,7 +179,7 @@ pub fn main() -> Result<utils::ExitCode> {
         ("man", Some(m)) => man(cfg, m)?,
         ("self", Some(c)) => match c.subcommand() {
             ("update", Some(_)) => self_update::update(cfg)?,
-            ("uninstall", Some(m)) => self_uninstall(m)?,
+            ("uninstall", Some(m)) => self_uninstall(cfg, m)?,
             (_, _) => unreachable!(),
         },
         ("set", Some(c)) => match c.subcommand() {
@@ -1590,10 +1590,10 @@ fn man(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
     Ok(utils::ExitCode(0))
 }
 
-fn self_uninstall(m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
+fn self_uninstall(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
     let no_prompt = m.is_present("no-prompt");
 
-    self_update::uninstall(no_prompt)
+    self_update::uninstall(cfg, no_prompt)
 }
 
 fn set_default_host_triple(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {

Diff for: src/cli/self_update.rs

@@ -903,7 +903,7 @@ fn _install_selection<'a>(
     })
 }
 
-pub(crate) fn uninstall(no_prompt: bool) -> Result<utils::ExitCode> {
+pub(crate) fn uninstall(cfg: &Cfg, no_prompt: bool) -> Result<utils::ExitCode> {
     if NEVER_SELF_UPDATE {
         err!("self-uninstall is disabled for this build of rustup");
         err!("you should probably use your system package manager to uninstall rustup");
@@ -926,6 +926,13 @@ pub(crate) fn uninstall(no_prompt: bool) -> Result<utils::ExitCode> {
         }
     }
 
+    info!("removing toolchains");
+    let toolchains = cfg.list_toolchains()?;
+    for toolchain in toolchains {
+        let toolchain = cfg.get_toolchain(&toolchain, false)?;
+        toolchain.remove()?;
+    }
+
     info!("removing rustup home");
 
     // Delete RUSTUP_HOME