refator: do not use two paths

Author: 0xPoe

src/cargo/ops/cargo_install.rs

@@ -316,14 +316,14 @@ impl<'gctx> InstallablePackage<'gctx> {
     fn install_one(mut self, dry_run: bool) -> CargoResult<bool> {
         self.gctx.shell().status("Installing", &self.pkg)?;
 
-        let dst = self.root.join("bin").into_path_unlocked();
-        // `dst` is usually absolute; if not, make it absolute so messages are clearer.
+        // Normalize to absolute path for consistency throughout.
         // See: https://github.com/rust-lang/cargo/issues/16023
+        let dst_path = self.root.join("bin").into_path_unlocked();
         let cwd = self.gctx.cwd();
-        let dst_abs_root = if dst.is_absolute() {
-            paths::normalize_path(dst.as_path())
+        let dst = if dst_path.is_absolute() {
+            paths::normalize_path(dst_path.as_path())
         } else {
-            paths::normalize_path(&cwd.join(&dst))
+            paths::normalize_path(&cwd.join(&dst_path))
         };
 
         let mut td_opt = None;
@@ -466,18 +466,17 @@ impl<'gctx> InstallablePackage<'gctx> {
         // Move the temporary copies into `dst` starting with new binaries.
         for bin in to_install.iter() {
             let src = staging_dir.path().join(bin);
-            let dst_rel = dst.join(bin);
-            let dst_abs = dst_abs_root.join(bin);
-            self.gctx.shell().status("Installing", dst_abs.display())?;
+            let dst_bin = dst.join(bin);
+            self.gctx.shell().status("Installing", dst_bin.display())?;
             if !dry_run {
-                fs::rename(&src, &dst_rel).with_context(|| {
+                fs::rename(&src, &dst_bin).with_context(|| {
                     format!(
                         "failed to move `{}` to `{}`",
                         src.display(),
-                        dst_abs.display()
+                        dst_bin.display()
                     )
                 })?;
-                installed.bins.push(dst_rel);
+                installed.bins.push(dst_bin);
                 successful_bins.insert(bin.to_string());
             }
         }
@@ -488,15 +487,14 @@ impl<'gctx> InstallablePackage<'gctx> {
             let mut try_install = || -> CargoResult<()> {
                 for &bin in to_replace.iter() {
                     let src = staging_dir.path().join(bin);
-                    let dst_rel = dst.join(bin);
-                    let dst_abs = dst_abs_root.join(bin);
-                    self.gctx.shell().status("Replacing", dst_abs.display())?;
+                    let dst_bin = dst.join(bin);
+                    self.gctx.shell().status("Replacing", dst_bin.display())?;
                     if !dry_run {
-                        fs::rename(&src, &dst_rel).with_context(|| {
+                        fs::rename(&src, &dst_bin).with_context(|| {
                             format!(
                                 "failed to move `{}` to `{}`",
                                 src.display(),
-                                dst_abs.display()
+                                dst_bin.display()
                             )
                         })?;
                         successful_bins.insert(bin.to_string());
@@ -673,7 +671,15 @@ pub fn install(
     lockfile_path: Option<&Path>,
 ) -> CargoResult<()> {
     let root = resolve_root(root, gctx)?;
-    let dst = root.join("bin").into_path_unlocked();
+    // Normalize to absolute path for consistency throughout.
+    // See: https://github.com/rust-lang/cargo/issues/16023
+    let dst_path = root.join("bin").into_path_unlocked();
+    let cwd = gctx.cwd();
+    let dst = if dst_path.is_absolute() {
+        paths::normalize_path(dst_path.as_path())
+    } else {
+        paths::normalize_path(&cwd.join(&dst_path))
+    };
     let map = SourceConfigMap::new(gctx)?;
 
     let current_rust_version = if opts.honor_rust_version.unwrap_or(true) {
@@ -795,22 +801,14 @@ pub fn install(
     if installed_anything {
         // Print a warning that if this directory isn't in PATH that they won't be
         // able to run these commands.
-        // `dst` is usually absolute; if not, make it absolute so messages are clearer.
-        // See: https://github.com/rust-lang/cargo/issues/16023
-        let cwd = gctx.cwd();
-        let dst_abs = if dst.is_absolute() {
-            paths::normalize_path(dst.as_path())
-        } else {
-            paths::normalize_path(&cwd.join(&dst))
-        };
         let path = gctx.get_env_os("PATH").unwrap_or_default();
-        let dst_in_path = env::split_paths(&path).any(|path| path == dst_abs);
+        let dst_in_path = env::split_paths(&path).any(|path| path == dst);
 
         if !dst_in_path {
             gctx.shell().warn(&format!(
                 "be sure to add `{}` to your PATH to be \
              able to run the installed binaries",
-                dst_abs.display()
+                dst.display()
             ))?;
         }
     }