Combine the behavior for cargo uninstall

Author: linyihai

src/cargo/ops/cargo_uninstall.rs

@@ -138,22 +138,15 @@ fn uninstall_pkgid(
     }
 
     if bins.is_empty() {
-        to_remove.extend(installed.iter().map(|b| dst.join(b)));
-        tracker.remove(pkgid, &installed);
+        to_remove = installed.iter().collect();
     } else {
-        for bin in bins.iter() {
-            to_remove.push(dst.join(bin));
-        }
-        tracker.remove(pkgid, &bins);
+        to_remove = bins.iter().collect();
     }
 
-    // This should have been handled last, but now restore it to reproduce the problem on the Windows platform.
-    // See issue #3364.
-    tracker.save()?;
-
     for bin in to_remove {
-        config.shell().status("Removing", bin.display())?;
-        paths::remove_file(bin)?;
+        let bin_path = dst.join(bin);
+        config.shell().status("Removing", bin_path.display())?;
+        tracker.remove_bin_then_save(pkgid, bin, &bin_path)?;
     }
 
     Ok(())

src/cargo/ops/common_for_install_and_uninstall.rs

@@ -7,6 +7,7 @@ use std::rc::Rc;
 use std::task::Poll;
 
 use anyhow::{bail, format_err, Context as _};
+use cargo_util::paths;
 use ops::FilterRule;
 use serde::{Deserialize, Serialize};
 
@@ -319,6 +320,20 @@ impl InstallTracker {
         self.v1.remove(pkg_id, bins);
         self.v2.remove(pkg_id, bins);
     }
+
+    /// Remove a bin after it successfully had been removed in disk and the save the tracker at last.
+    pub fn remove_bin_then_save(
+        &mut self,
+        pkg_id: PackageId,
+        bin: &str,
+        bin_path: &PathBuf,
+    ) -> CargoResult<()> {
+        paths::remove_file(bin_path)?;
+        self.v1.remove_bin(pkg_id, bin);
+        self.v2.remove_bin(pkg_id, bin);
+        self.save()?;
+        Ok(())
+    }
 }
 
 impl CrateListingV1 {
@@ -359,6 +374,17 @@ impl CrateListingV1 {
         }
     }
 
+    fn remove_bin(&mut self, pkg_id: PackageId, bin: &str) {
+        let mut installed = match self.v1.entry(pkg_id) {
+            btree_map::Entry::Occupied(e) => e,
+            btree_map::Entry::Vacant(..) => panic!("v1 unexpected missing `{}`", pkg_id),
+        };
+        installed.get_mut().remove(bin);
+        if installed.get().is_empty() {
+            installed.remove();
+        }
+    }
+
     fn save(&self, lock: &FileLock) -> CargoResult<()> {
         let mut file = lock.file();
         file.seek(SeekFrom::Start(0))?;
@@ -468,6 +494,17 @@ impl CrateListingV2 {
         }
     }
 
+    fn remove_bin(&mut self, pkg_id: PackageId, bin: &str) {
+        let mut info_entry = match self.installs.entry(pkg_id) {
+            btree_map::Entry::Occupied(e) => e,
+            btree_map::Entry::Vacant(..) => panic!("v1 unexpected missing `{}`", pkg_id),
+        };
+        info_entry.get_mut().bins.remove(bin);
+        if info_entry.get().bins.is_empty() {
+            info_entry.remove();
+        }
+    }
+
     fn save(&self, lock: &FileLock) -> CargoResult<()> {
         let mut file = lock.file();
         file.seek(SeekFrom::Start(0))?;