Support for rustup category home mode

Cargo.toml

@@ -118,6 +118,7 @@ features = [
   "Win32_Foundation",
   "Win32_Security",
   "Win32_Storage_FileSystem",
+  "Win32_System_Com",
   "Win32_System_Console",
   "Win32_System_Diagnostics_ToolHelp",
   "Win32_System_IO",
@@ -130,6 +131,7 @@ features = [
   "Win32_System_Threading",
   "Win32_System_WindowsProgramming",
   "Win32_UI",
+  "Win32_UI_Shell",
   "Win32_UI_WindowsAndMessaging",
 ]
 version = "0.61"

src/cli/proxy_mode.rs

@@ -14,7 +14,7 @@ pub async fn main(
     current_dir: PathBuf,
     process: &Process,
 ) -> anyhow::Result<ExitStatus> {
-    self_update::cleanup_self_updater(process)?;
+    self_update::cleanup_self_updater(&process.rustup_bin_home()?)?;
 
     let _setup = job::setup();
     let mut args = process.args_os().skip(1);

src/cli/rustup_mode.rs

@@ -388,7 +388,7 @@ enum ShowSubcmd {
         verbose: bool,
     },
 
-    /// Display the computed value of RUSTUP_HOME
+    /// Display resolved Rustup home directories
     Home,
 
     /// Show the default profile used for the `rustup install` command
@@ -703,7 +703,7 @@ pub async fn main(
         .bin("rustup")
         .complete();
 
-    self_update::cleanup_self_updater(process)?;
+    self_update::cleanup_self_updater(&process.rustup_bin_home()?)?;
 
     use clap::error::ErrorKind::*;
     let matches = match Rustup::try_parse_from(process.args_os()) {
@@ -1271,14 +1271,27 @@ async fn show(cfg: &Cfg<'_>, verbose: bool) -> anyhow::Result<ExitCode> {
         cfg.default_host_tuple()?
     )?;
 
-    // Print rustup home directory
     {
         let mut t = t.lock();
-        writeln!(
-            t,
-            "{HEADER}rustup home:  {HEADER:#}{}",
-            cfg.rustup_dir.display()
-        )?;
+        if cfg.process.use_category_home() {
+            writeln!(t, "{HEADER}rustup homes:{HEADER:#}")?;
+            for (name, home) in [
+                ("config", &cfg.rustup_config_dir),
+                ("state", &cfg.rustup_state_dir),
+                ("data", &cfg.rustup_data_dir),
+                ("cache", &cfg.rustup_cache_dir),
+                ("bin", &cfg.process.rustup_bin_home()?),
+            ] {
+                writeln!(t, "  {name}: {}", home.display())?;
+            }
+        } else {
+            // In legacy mode, all four category homes equal the resolved RUSTUP_HOME.
+            writeln!(
+                t,
+                "{HEADER}rustup home:  {HEADER:#}{}",
+                cfg.rustup_data_dir.display()
+            )?;
+        }
         writeln!(t)?;
     }
 
@@ -1426,7 +1439,20 @@ async fn show_active_toolchain(cfg: &Cfg<'_>, verbose: bool) -> anyhow::Result<E
 
 #[tracing::instrument(level = "trace", skip_all)]
 fn show_rustup_home(cfg: &Cfg<'_>) -> anyhow::Result<ExitCode> {
-    writeln!(cfg.process.stdout().lock(), "{}", cfg.rustup_dir.display())?;
+    let mut stdout = cfg.process.stdout().lock();
+    if cfg.process.use_category_home() {
+        for (name, home) in [
+            ("config", &cfg.rustup_config_dir),
+            ("state", &cfg.rustup_state_dir),
+            ("data", &cfg.rustup_data_dir),
+            ("cache", &cfg.rustup_cache_dir),
+        ] {
+            writeln!(stdout, "{name}: {}", home.display())?;
+        }
+    } else {
+        // In legacy mode, all four category homes equal the resolved RUSTUP_HOME.
+        writeln!(stdout, "{}", cfg.rustup_data_dir.display())?;
+    }
     Ok(ExitCode::SUCCESS)
 }