diff --git a/crates/hir_def/src/body.rs b/crates/hir_def/src/body.rs index 1080d9c2c37e..ad3d5afbec76 100644 --- a/crates/hir_def/src/body.rs +++ b/crates/hir_def/src/body.rs @@ -226,7 +226,7 @@ pub struct Body { /// The `ExprId` of the actual body expression. pub body_expr: ExprId, /// Block expressions in this body that may contain inner items. - pub block_scopes: Vec, + block_scopes: Vec, _c: Count, } @@ -310,6 +310,16 @@ pub(crate) fn body_query(db: &dyn DefDatabase, def: DefWithBodyId) -> Arc db.body_with_source_map(def).0 } + /// Returns an iterator over all block expressions in this body that define inner items. + pub fn blocks<'a>( + &'a self, + db: &'a dyn DefDatabase, + ) -> impl Iterator)> + '_ { + self.block_scopes + .iter() + .filter_map(move |block| db.block_def_map(*block).map(|map| (*block, map))) + } + fn new( db: &dyn DefDatabase, expander: Expander, diff --git a/crates/hir_def/src/child_by_source.rs b/crates/hir_def/src/child_by_source.rs index 2a331dcaf9db..f40a7f80d314 100644 --- a/crates/hir_def/src/child_by_source.rs +++ b/crates/hir_def/src/child_by_source.rs @@ -160,7 +160,7 @@ fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap) { impl ChildBySource for DefWithBodyId { fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap) { let body = db.body(*self); - for def_map in body.block_scopes.iter().filter_map(|block| db.block_def_map(*block)) { + for (_, def_map) in body.blocks(db) { // All block expressions are merged into the same map, because they logically all add // inner items to the containing `DefWithBodyId`. def_map[def_map.root()].scope.child_by_source_to(db, res); diff --git a/crates/hir_ty/src/diagnostics/decl_check.rs b/crates/hir_ty/src/diagnostics/decl_check.rs index 207c7cb824e9..1c9f9ede76d3 100644 --- a/crates/hir_ty/src/diagnostics/decl_check.rs +++ b/crates/hir_ty/src/diagnostics/decl_check.rs @@ -99,8 +99,7 @@ fn validate_func(&mut self, func: FunctionId) { let body = self.db.body(func.into()); // Recursively validate inner scope items, such as static variables and constants. - let db = self.db; - for block_def_map in body.block_scopes.iter().filter_map(|block| db.block_def_map(*block)) { + for (_, block_def_map) in body.blocks(self.db.upcast()) { for (_, module) in block_def_map.modules() { for def_id in module.scope.declarations() { let mut validator = DeclValidator::new(self.db, self.krate, self.sink); diff --git a/crates/hir_ty/src/tests.rs b/crates/hir_ty/src/tests.rs index ad283c1e04ba..ccfb88c52d0c 100644 --- a/crates/hir_ty/src/tests.rs +++ b/crates/hir_ty/src/tests.rs @@ -288,7 +288,7 @@ fn visit_scope( } fn visit_body(db: &TestDB, body: &Body, cb: &mut dyn FnMut(DefWithBodyId)) { - for def_map in body.block_scopes.iter().filter_map(|block| db.block_def_map(*block)) { + for (_, def_map) in body.blocks(db) { for (mod_id, _) in def_map.modules() { visit_module(db, &def_map, mod_id, cb); }