Skip to content

Commit 4ea5f69

Browse files
Undo path resolution hack for extern prelude
We don't populate the extern prelude for block DefMaps anymore, so this is unnecessary
1 parent 99ed68a commit 4ea5f69

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

crates/hir_def/src/nameres/path_resolution.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -384,15 +384,10 @@ impl DefMap {
384384
}
385385
}
386386
};
387-
// Give precedence to names in outer `DefMap`s over the extern prelude; only check prelude
388-
// from the crate DefMap.
389-
let from_extern_prelude = match self.block {
390-
Some(_) => PerNs::none(),
391-
None => self
392-
.extern_prelude
393-
.get(name)
394-
.map_or(PerNs::none(), |&it| PerNs::types(it, Visibility::Public)),
395-
};
387+
let from_extern_prelude = self
388+
.extern_prelude
389+
.get(name)
390+
.map_or(PerNs::none(), |&it| PerNs::types(it, Visibility::Public));
396391

397392
let from_prelude = self.resolve_in_prelude(db, name);
398393

0 commit comments

Comments
 (0)