user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undo path resolution hack for extern prelude

Browse source 
We don't populate the extern prelude for block DefMaps anymore,
so this is unnecessary
This commit is contained in:
Jonas Schievink 2021-04-09 14:46:52 +02:00
parent 99ed68a109
commit 4ea5f690bc
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/hir_def/src/nameres/path_resolution.rs
View file

@ -384,15 +384,10 @@ impl DefMap {
}
}
};
// Give precedence to names in outer `DefMap`s over the extern prelude; only check prelude
// from the crate DefMap.
let from_extern_prelude = match self.block {
Some(_) => PerNs::none(),
None => self
.extern_prelude
.get(name)
.map_or(PerNs::none(), |&it| PerNs::types(it, Visibility::Public)),
};
let from_extern_prelude = self
.extern_prelude
.get(name)
.map_or(PerNs::none(), |&it| PerNs::types(it, Visibility::Public));
let from_prelude = self.resolve_in_prelude(db, name);