Skip to content

Commit 0baf85e

Browse files
committed
remove some uses of visit_all_item_likes in incremental, metadata and interface crates
Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>
1 parent b73b4de commit 0baf85e

File tree

6 files changed

+64
-7
lines changed

6 files changed

+64
-7
lines changed

compiler/rustc_incremental/src/persist/dirty_clean.rs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,28 @@ pub fn check_dirty_clean_annotations(tcx: TyCtxt<'_>) {
147147

148148
tcx.dep_graph.with_ignore(|| {
149149
let mut dirty_clean_visitor = DirtyCleanVisitor { tcx, checked_attrs: Default::default() };
150-
tcx.hir().visit_all_item_likes(&mut dirty_clean_visitor);
150+
151+
let crate_items = tcx.hir_crate_items(());
152+
153+
for id in crate_items.items() {
154+
let item = tcx.hir().item(id);
155+
dirty_clean_visitor.check_item(item.def_id, item.span);
156+
}
157+
158+
for id in crate_items.trait_items() {
159+
let item = tcx.hir().trait_item(id);
160+
dirty_clean_visitor.check_item(item.def_id, item.span);
161+
}
162+
163+
for id in crate_items.impl_items() {
164+
let item = tcx.hir().impl_item(id);
165+
dirty_clean_visitor.check_item(item.def_id, item.span);
166+
}
167+
168+
for id in crate_items.foreign_items() {
169+
let item = tcx.hir().foreign_item(id);
170+
dirty_clean_visitor.check_item(item.def_id, item.span);
171+
}
151172

152173
let mut all_attrs = FindAllAttrs { tcx, found_attrs: vec![] };
153174
tcx.hir().walk_attributes(&mut all_attrs);

compiler/rustc_interface/src/proc_macro_decls.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@ use rustc_span::symbol::sym;
77

88
fn proc_macro_decls_static(tcx: TyCtxt<'_>, (): ()) -> Option<LocalDefId> {
99
let mut finder = Finder { tcx, decls: None };
10-
tcx.hir().visit_all_item_likes(&mut finder);
10+
11+
for id in tcx.hir().items() {
12+
let item = tcx.hir().item(id);
13+
let attrs = finder.tcx.hir().attrs(item.hir_id());
14+
if finder.tcx.sess.contains_name(attrs, sym::rustc_proc_macro_decls) {
15+
finder.decls = Some(item.hir_id());
16+
}
17+
}
1118

1219
finder.decls.map(|id| tcx.hir().local_def_id(id))
1320
}

compiler/rustc_metadata/src/foreign_modules.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@ use rustc_middle::ty::TyCtxt;
44
use rustc_session::cstore::ForeignModule;
55

66
crate fn collect(tcx: TyCtxt<'_>) -> Vec<ForeignModule> {
7-
let mut collector = Collector { modules: Vec::new() };
8-
tcx.hir().visit_all_item_likes(&mut collector);
9-
collector.modules
7+
let mut modules = Vec::new();
8+
for id in tcx.hir().items() {
9+
let item = tcx.hir().item(id);
10+
let hir::ItemKind::ForeignMod { items, .. } = item.kind else {
11+
continue;
12+
};
13+
let foreign_items = items.iter().map(|it| it.id.def_id.to_def_id()).collect();
14+
modules.push(ForeignModule { foreign_items, def_id: id.def_id.to_def_id() });
15+
}
16+
modules
1017
}
1118

1219
struct Collector {

compiler/rustc_metadata/src/native_libs.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ use rustc_target::spec::abi::Abi;
1515

1616
crate fn collect(tcx: TyCtxt<'_>) -> Vec<NativeLib> {
1717
let mut collector = Collector { tcx, libs: Vec::new() };
18-
tcx.hir().visit_all_item_likes(&mut collector);
18+
for id in tcx.hir().items() {
19+
let item = tcx.hir().item(id);
20+
collector.visit_item(item);
21+
}
1922
collector.process_command_line();
2023
collector.libs
2124
}

compiler/rustc_metadata/src/rmeta/encoder.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,11 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
17841784
empty_proc_macro!(self);
17851785
let tcx = self.tcx;
17861786
let mut visitor = ImplsVisitor { tcx, impls: FxHashMap::default() };
1787-
tcx.hir().visit_all_item_likes(&mut visitor);
1787+
1788+
for id in tcx.hir().items() {
1789+
let item = tcx.hir().item(id);
1790+
visitor.visit_item(item);
1791+
}
17881792

17891793
let mut all_impls: Vec<_> = visitor.impls.into_iter().collect();
17901794

compiler/rustc_middle/src/hir/mod.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,21 @@ pub struct ModuleItems {
4545
foreign_items: Box<[ForeignItemId]>,
4646
}
4747

48+
impl ModuleItems {
49+
pub fn items(&self) -> impl Iterator<Item = ItemId> {
50+
self.items.to_vec().into_iter()
51+
}
52+
pub fn trait_items(&self) -> impl Iterator<Item = TraitItemId> {
53+
self.trait_items.to_vec().into_iter()
54+
}
55+
pub fn impl_items(&self) -> impl Iterator<Item = ImplItemId> {
56+
self.impl_items.to_vec().into_iter()
57+
}
58+
pub fn foreign_items(&self) -> impl Iterator<Item = ForeignItemId> {
59+
self.foreign_items.to_vec().into_iter()
60+
}
61+
}
62+
4863
impl<'tcx> TyCtxt<'tcx> {
4964
#[inline(always)]
5065
pub fn hir(self) -> map::Map<'tcx> {

0 commit comments

Comments
 (0)