Inline addition/removal to programs

Author: djc

src/cli/self_update.rs

@@ -853,8 +853,6 @@ async fn maybe_install_rust(
     unix::do_write_env_files(process)?;
 
     if !opts.no_modify_path {
-        #[cfg(windows)]
-        windows::do_add_to_programs(process)?;
         do_add_to_path(process)?;
     }
 
@@ -942,8 +940,6 @@ pub(crate) fn uninstall(no_prompt: bool, process: &Process) -> Result<utils::Exi
 
     // Remove CARGO_HOME/bin from PATH
     do_remove_from_path(process)?;
-    #[cfg(windows)]
-    windows::do_remove_from_programs()?;
 
     // Delete everything in CARGO_HOME *except* the rustup bin
 

src/cli/self_update/windows.rs

@@ -456,7 +456,8 @@ pub(crate) fn wait_for_parent() -> Result<()> {
 
 pub(crate) fn do_add_to_path(process: &Process) -> Result<()> {
     let new_path = _with_path_cargo_home_bin(_add_to_path, process)?;
-    _apply_new_path(new_path)
+    _apply_new_path(new_path)?;
+    do_add_to_programs(process)
 }
 
 fn _apply_new_path(new_path: Option<Vec<u16>>) -> Result<()> {
@@ -585,7 +586,8 @@ where
 
 pub(crate) fn do_remove_from_path(process: &Process) -> Result<()> {
     let new_path = _with_path_cargo_home_bin(_remove_from_path, process)?;
-    _apply_new_path(new_path)
+    _apply_new_path(new_path)?;
+    do_remove_from_programs()
 }
 
 const RUSTUP_UNINSTALL_ENTRY: &str = r"Software\Microsoft\Windows\CurrentVersion\Uninstall\Rustup";