bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove staticlibs local variable.

Browse source
This commit is contained in:
Nicholas Nethercote 2022-02-04 09:56:18 +11:00
parent 6dcda2aaec
commit 2b8d3dea63
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -385,7 +385,6 @@ impl<'a> CrateLocator<'a> {
let mut candidates: FxHashMap<_, (FxHashMap<_, _>, FxHashMap<_, _>, FxHashMap<_, _>)> = let mut candidates: FxHashMap<_, (FxHashMap<_, _>, FxHashMap<_, _>, FxHashMap<_, _>)> =
Default::default(); Default::default();
let mut staticlibs = vec![];
// First, find all possible candidate rlibs and dylibs purely based on // First, find all possible candidate rlibs and dylibs purely based on
// the name of the files themselves. We're trying to match against an // the name of the files themselves. We're trying to match against an
@ -414,7 +413,7 @@ impl<'a> CrateLocator<'a> {
(&f[dylib_prefix.len()..(f.len() - dylib_suffix.len())], CrateFlavor::Dylib) (&f[dylib_prefix.len()..(f.len() - dylib_suffix.len())], CrateFlavor::Dylib)
} else { } else {
if f.starts_with(staticlib_prefix) && f.ends_with(staticlib_suffix) { if f.starts_with(staticlib_prefix) && f.ends_with(staticlib_suffix) {
staticlibs.push(CrateMismatch { self.crate_rejections.via_kind.push(CrateMismatch {
path: spf.path.clone(), path: spf.path.clone(),
got: "static".to_string(), got: "static".to_string(),
}); });
@ -438,8 +437,6 @@ impl<'a> CrateLocator<'a> {
} }
} }
self.crate_rejections.via_kind.extend(staticlibs);
// We have now collected all known libraries into a set of candidates // We have now collected all known libraries into a set of candidates
// keyed of the filename hash listed. For each filename, we also have a // keyed of the filename hash listed. For each filename, we also have a
// list of rlibs/dylibs that apply. Here, we map each of these lists // list of rlibs/dylibs that apply. Here, we map each of these lists