Don't canonicalize binaries

This avoids resolving rustup shims to their real name

Author: ChrisDenton

src/cmd/mod.rs

@@ -437,14 +437,15 @@ impl<'w, 'pl> Command<'w, 'pl> {
                 // global paths should never be normalized
                 Binary::Global(path) => (path, false),
                 Binary::ManagedByRustwide(path) => {
-                    let binary = self
-                        .workspace
-                        .expect("calling rustwide bins without a workspace is not supported")
-                        .cargo_home()
-                        .join("bin")
-                        .join(exe_suffix(path.as_os_str()));
                     // `cargo_home()` might a relative path
-                    (crate::utils::normalize_path(&binary), true)
+                    let cargo_home = crate::utils::normalize_path(
+                        &self
+                            .workspace
+                            .expect("calling rustwide bins without a workspace is not supported")
+                            .cargo_home(),
+                    );
+                    let binary = cargo_home.join("bin").join(exe_suffix(path.as_os_str()));
+                    (binary, true)
                 }
             };
 

src/tools/mod.rs

@@ -38,11 +38,11 @@ trait Tool: Send + Sync {
     fn update(&self, workspace: &Workspace, fast_install: bool) -> anyhow::Result<()>;
 
     fn binary_path(&self, workspace: &Workspace) -> PathBuf {
-        crate::utils::normalize_path(&workspace.cargo_home().join("bin").join(format!(
-            "{}{}",
-            self.name(),
-            EXE_SUFFIX
-        )))
+        // `cargo_home()` might a relative path
+        let cargo_home = crate::utils::normalize_path(&workspace.cargo_home());
+        cargo_home
+            .join("bin")
+            .join(format!("{}{}", self.name(), EXE_SUFFIX))
     }
 }