mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ResolverTree does not require access to the crate loader, only the store

Browse Source
This commit is contained in:
Oli Scherer 2022-12-07 13:34:05 +00:00
parent 14ca83a04b
commit 4b08fbaea8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_resolve/src/effective_visibilities.rs
View File

@ -107,7 +107,7 @@ pub fn compute_effective_visibilities<'c>(r: &'r mut Resolver<'a>, krate: &'c Cr
r.effective_visibilities.update_eff_vis(
r.local_def_id(node_id),
eff_vis,
ResolverTree(&r.definitions, &r.crate_loader),
ResolverTree(&r.definitions, r.crate_loader.cstore()),
)
}
}

10
compiler/rustc_resolve/src/lib.rs
View File

@ -1112,15 +1112,15 @@ fn as_mut(&mut self) -> &mut Resolver<'a> {
/// A minimal subset of resolver that can implemenent `DefIdTree`, sometimes
/// required to satisfy borrow checker by avoiding borrowing the whole resolver.
#[derive(Clone, Copy)]
struct ResolverTree<'a, 'b>(&'a Definitions, &'a CrateLoader<'b>);
struct ResolverTree<'a>(&'a Definitions, &'a CStore);
impl DefIdTree for ResolverTree<'_, '_> {
impl DefIdTree for ResolverTree<'_> {
#[inline]
fn opt_parent(self, id: DefId) -> Option<DefId> {
let ResolverTree(definitions, crate_loader) = self;
let ResolverTree(definitions, cstore) = self;
match id.as_local() {
Some(id) => definitions.def_key(id).parent,
None => crate_loader.cstore().def_key(id).parent,
None => cstore.def_key(id).parent,
}
.map(|index| DefId { index, ..id })
}
@ -1129,7 +1129,7 @@ fn opt_parent(self, id: DefId) -> Option<DefId> {
impl<'a, 'b> DefIdTree for &'a Resolver<'b> {
#[inline]
fn opt_parent(self, id: DefId) -> Option<DefId> {
ResolverTree(&self.definitions, &self.crate_loader).opt_parent(id)
ResolverTree(&self.definitions, self.cstore()).opt_parent(id)
}
}