bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Simplify find_commandline_library

Browse source
This commit is contained in:
bjorn3 2025-01-14 14:49:58 +00:00 • committed by Jakub Beránek
parent 7bfd9529be
commit 0666b740e5
1 changed files with 16 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_metadata/src/locator.rs
View file

@ -728,38 +728,26 @@ impl<'a> CrateLocator<'a> {
let Some(file) = loc_orig.file_name().and_then(|s| s.to_str()) else {
return Err(CrateError::ExternLocationNotFile(self.crate_name, loc_orig.clone()));
};
// FnMut cannot return reference to captured value, so references
// must be taken outside the closure.
let rlibs = &mut rlibs;
let rmetas = &mut rmetas;
let dylibs = &mut dylibs;
let type_via_filename = (|| {
if file.starts_with("lib") {
if file.ends_with(".rlib") {
return Some(rlibs);
rlibs.insert(loc_canon.clone(), PathKind::ExternFlag);
continue;
}
if file.ends_with(".rmeta") {
return Some(rmetas);
rmetas.insert(loc_canon.clone(), PathKind::ExternFlag);
continue;
}
}
let dll_prefix = self.target.dll_prefix.as_ref();
let dll_suffix = self.target.dll_suffix.as_ref();
if file.starts_with(dll_prefix) && file.ends_with(dll_suffix) {
return Some(dylibs);
dylibs.insert(loc_canon.clone(), PathKind::ExternFlag);
continue;
}
None
})();
match type_via_filename {
Some(type_via_filename) => {
type_via_filename.insert(loc_canon.clone(), PathKind::ExternFlag);
}
None => {
self.crate_rejections
.via_filename
.push(CrateMismatch { path: loc_orig.clone(), got: String::new() });
}
}
}
// Extract the dylib/rlib/rmeta triple.
self.extract_lib(rlibs, rmetas, dylibs).map(|opt| opt.map(|(_, lib)| lib))