bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove rlib special-casing in FileSearch::search.

Browse source 
This code and comment appear to be out of date.
`CrateLocator::find_library_crate` is the only caller of this function
and it handles rlib vs dylib overlap itself (see
`CrateLocator::extract_lib`) after inspecting all the files present, so
it doesn't need to see them in any particular order.
This commit is contained in:
Nicholas Nethercote 2022-02-01 16:18:39 +11:00
parent ad88831cd5
commit f916f3a36b
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_session/src/filesearch.rs
View file

@ -49,16 +49,7 @@ impl<'a> FileSearch<'a> {
{
for search_path in self.search_paths() {
debug!("searching {}", search_path.dir.display());
fn is_rlib(spf: &SearchPathFile) -> bool {
if let Some(f) = &spf.file_name_str { f.ends_with(".rlib") } else { false }
}
// Reading metadata out of rlibs is faster, and if we find both
// an rlib and a dylib we only read one of the files of
// metadata, so in the name of speed, bring all rlib files to
// the front of the search list.
let files1 = search_path.files.iter().filter(|spf| is_rlib(&spf));
let files2 = search_path.files.iter().filter(|spf| !is_rlib(&spf));
for spf in files1.chain(files2) {
for spf in search_path.files.iter() {
debug!("testing {}", spf.path.display());
let maybe_picked = pick(spf, search_path.kind);
match maybe_picked {