From 00260347e344bbf3af708b7a70b7aaecfc684c03 Mon Sep 17 00:00:00 2001 From: Miguel Guarniz Date: Tue, 3 May 2022 15:46:44 -0400 Subject: [PATCH] replace usage of visit_item_likes_in_modules with hir_module_items query Signed-off-by: Miguel Guarniz --- compiler/rustc_passes/src/check_const.rs | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_passes/src/check_const.rs b/compiler/rustc_passes/src/check_const.rs index e0922d41937b..7567fb075cce 100644 --- a/compiler/rustc_passes/src/check_const.rs +++ b/compiler/rustc_passes/src/check_const.rs @@ -58,10 +58,28 @@ impl NonConstExpr { fn check_mod_const_bodies(tcx: TyCtxt<'_>, module_def_id: LocalDefId) { let mut vis = CheckConstVisitor::new(tcx); - tcx.hir().visit_item_likes_in_module(module_def_id, &mut vis.as_deep_visitor()); - for id in tcx.hir_module_items(module_def_id).items() { + let module = tcx.hir_module_items(module_def_id); + + for id in module.items() { + vis.visit_item(tcx.hir().item(id)); check_item(tcx, id); } + + for id in module.trait_items() { + vis.visit_trait_item(tcx.hir().trait_item(id)); + } + + for id in module.impl_items() { + vis.visit_impl_item(tcx.hir().impl_item(id)); + } + + for id in module.foreign_items() { + vis.visit_foreign_item(tcx.hir().foreign_item(id)); + } + + // for id in tcx.hir_module_items(module_def_id).items() { + // check_item(tcx, id); + // } } pub(crate) fn provide(providers: &mut Providers) {