bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

with_scope is only ever used for ast modules

Browse source
This commit is contained in:
Oli Scherer 2025-03-24 09:39:02 +00:00
parent 87e60a7d28
commit 2d3115f61f
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/rustc_resolve/src/late.rs
View file

@ -1544,20 +1544,17 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
ret ret
} }
fn with_scope<T>(&mut self, id: NodeId, f: impl FnOnce(&mut Self) -> T) -> T { fn with_mod_rib<T>(&mut self, id: NodeId, f: impl FnOnce(&mut Self) -> T) -> T {
if let Some(module) = self.r.get_module(self.r.local_def_id(id).to_def_id()) { let module = self.r.expect_module(self.r.local_def_id(id).to_def_id());
// Move down in the graph. // Move down in the graph.
let orig_module = replace(&mut self.parent_scope.module, module); let orig_module = replace(&mut self.parent_scope.module, module);
self.with_rib(ValueNS, RibKind::Module(module), |this| { self.with_rib(ValueNS, RibKind::Module(module), |this| {
this.with_rib(TypeNS, RibKind::Module(module), |this| { this.with_rib(TypeNS, RibKind::Module(module), |this| {
let ret = f(this); let ret = f(this);
this.parent_scope.module = orig_module; this.parent_scope.module = orig_module;
ret ret
})
}) })
} else { })
f(self)
}
} }
fn visit_generic_params(&mut self, params: &'ast [GenericParam], add_self_upper: bool) { fn visit_generic_params(&mut self, params: &'ast [GenericParam], add_self_upper: bool) {
@ -2738,7 +2735,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
} }
ItemKind::Mod(..) => { ItemKind::Mod(..) => {
self.with_scope(item.id, |this| { self.with_mod_rib(item.id, |this| {
if mod_inner_docs { if mod_inner_docs {
this.resolve_doc_links(&item.attrs, MaybeExported::Ok(item.id)); this.resolve_doc_links(&item.attrs, MaybeExported::Ok(item.id));
} }