/// 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<BlockId>,
+ block_scopes: Vec<BlockId>,
_c: Count<Self>,
}
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<Item = (BlockId, Arc<DefMap>)> + '_ {
+ self.block_scopes
+ .iter()
+ .filter_map(move |block| db.block_def_map(*block).map(|map| (*block, map)))
+ }
+
fn new(
db: &dyn DefDatabase,
expander: Expander,
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);
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);
}
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);
}
projects / rust.git / commitdiff