Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-17 10:18:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5088

Browse source 
5088: Better exe probing r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-06-27 00:05:02 +00:00 committed by GitHub
commit 9a4d02faf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/ra_toolchain/src/lib.rs
View file

@ -46,22 +46,23 @@ fn get_path_for_executable(executable_name: &'static str) -> PathBuf {
path.push(".cargo");
path.push("bin");
path.push(executable_name);
if path.is_file() {
if let Some(path) = probe(path) {
return path;
}
}
executable_name.into()
}
fn lookup_in_path(exec: &str) -> bool {
let paths = env::var_os("PATH").unwrap_or_default();
let mut candidates = env::split_paths(&paths).flat_map(|path| {
let candidate = path.join(&exec);
let with_exe = match env::consts::EXE_EXTENSION {
"" => None,
it => Some(candidate.with_extension(it)),
};
iter::once(candidate).chain(with_exe)
});
candidates.any(|it| it.is_file())
env::split_paths(&paths).map(|path| path.join(exec)).find_map(probe).is_some()
}
fn probe(path: PathBuf) -> Option<PathBuf> {
let with_extension = match env::consts::EXE_EXTENSION {
"" => None,
it => Some(path.with_extension(it)),
};
iter::once(path).chain(with_extension).find(|it| it.is_file())
}