Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't canonicalize executable path #9991

Merged
merged 3 commits into from
Oct 23, 2021
Merged

Don't canonicalize executable path #9991

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d06193
Only canonicalize executable path if it has relative directories
Byron Oct 21, 2021
4906ef2
Assure the binary name won't change after canonicalization, and keep …
Byron Oct 21, 2021
cf8e464
Do not canonicalize the exe-candidate at all
Byron Oct 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions crates/cargo-util/src/paths.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,13 @@ pub fn resolve_executable(exec: &Path) -> Result<PathBuf> {
});
for candidate in candidates {
if candidate.is_file() {
// PATH may have a component like "." in it, so we still need to
// canonicalize.
return Ok(candidate.canonicalize()?);
return Ok(candidate);
}
}

anyhow::bail!("no executable for `{}` found in PATH", exec.display())
} else {
Ok(exec.canonicalize()?)
Ok(exec.into())
}
}

Expand Down