squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #7525

Browse source 
7525: Fix resolution of `crate` paths from within blocks r=jonas-schievink a=jonas-schievink

They resolve to the crate root, not the DefMap's root module (which
can be a block)

bors r+

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2021-02-02 17:02:48 +00:00 committed by GitHub
commit 7e66cde764
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/hir_def/src/nameres.rs
View file

@ -275,6 +275,11 @@ impl DefMap {
ModuleId { krate: self.krate, local_id, block }
}
pub(crate) fn crate_root(&self) -> ModuleId {
let (root_map, _) = self.ancestor_maps(self.root).last().unwrap();
root_map.module_id(root_map.root)
}
pub(crate) fn resolve_path(
&self,
db: &dyn DefDatabase,

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

@ -152,7 +152,7 @@ impl DefMap {
PathKind::DollarCrate(krate) => {
if krate == self.krate {
mark::hit!(macro_dollar_crate_self);
PerNs::types(self.module_id(self.root).into(), Visibility::Public)
PerNs::types(self.crate_root().into(), Visibility::Public)
} else {
let def_map = db.crate_def_map(krate);
let module = def_map.module_id(def_map.root);
@ -160,7 +160,7 @@ impl DefMap {
PerNs::types(module.into(), Visibility::Public)
}
}
PathKind::Crate => PerNs::types(self.module_id(self.root).into(), Visibility::Public),
PathKind::Crate => PerNs::types(self.crate_root().into(), Visibility::Public),
// plain import or absolute path in 2015: crate-relative with
// fallback to extern prelude (with the simplification in
// rust-lang/rust#57745)