Skip to content

internal: Make resolve_name_in_module a bit more lazy #13026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2022
Merged

internal: Make resolve_name_in_module a bit more lazy #13026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions crates/hir-def/src/nameres/path_resolution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,35 +397,35 @@ impl DefMap {
Some(_) | None => from_scope.or(from_builtin),
},
};
let from_extern_prelude = self
.extern_prelude
.get(name)
.map_or(PerNs::none(), |&it| PerNs::types(it.into(), Visibility::Public));

let from_prelude = self.resolve_in_prelude(db, name);
let extern_prelude = || {
self.extern_prelude
.get(name)
.map_or(PerNs::none(), |&it| PerNs::types(it.into(), Visibility::Public))
};
let prelude = || self.resolve_in_prelude(db, name);

from_legacy_macro.or(from_scope_or_builtin).or(from_extern_prelude).or(from_prelude)
from_legacy_macro.or(from_scope_or_builtin).or_else(extern_prelude).or_else(prelude)
}

fn resolve_name_in_crate_root_or_extern_prelude(
&self,
db: &dyn DefDatabase,
name: &Name,
) -> PerNs {
let arc;
let crate_def_map = match self.block {
let from_crate_root = match self.block {
Some(_) => {
arc = self.crate_root(db).def_map(db);
&arc
let def_map = self.crate_root(db).def_map(db);
def_map[def_map.root].scope.get(name)
}
None => self,
None => self[self.root].scope.get(name),
};
let from_extern_prelude = || {
self.resolve_name_in_extern_prelude(db, name)
.map_or(PerNs::none(), |it| PerNs::types(it.into(), Visibility::Public))
};
let from_crate_root = crate_def_map[crate_def_map.root].scope.get(name);
let from_extern_prelude = self
.resolve_name_in_extern_prelude(db, name)
.map_or(PerNs::none(), |it| PerNs::types(it.into(), Visibility::Public));

from_crate_root.or(from_extern_prelude)
from_crate_root.or_else(from_extern_prelude)
}

fn resolve_in_prelude(&self, db: &dyn DefDatabase, name: &Name) -> PerNs {
Expand Down
12 changes: 12 additions & 0 deletions crates/hir-def/src/per_ns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ impl PerNs {
self.types.is_none() && self.values.is_none() && self.macros.is_none()
}

pub fn is_full(&self) -> bool {
self.types.is_some() && self.values.is_some() && self.macros.is_some()
}

pub fn take_types(self) -> Option<ModuleDefId> {
self.types.map(|it| it.0)
}
Expand Down Expand Up @@ -84,6 +88,14 @@ impl PerNs {
}
}

pub fn or_else(self, f: impl FnOnce() -> PerNs) -> PerNs {
if self.is_full() {
self
} else {
self.or(f())
}
}

pub fn iter_items(self) -> impl Iterator<Item = ItemInNs> {
let _p = profile::span("PerNs::iter_items");
self.types
Expand Down