From 7202ce6c963f047b8890ee50acc5aaf5d65f175d Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 2 Feb 2021 11:46:58 +0100 Subject: Revert "Use block_def_map in body lowering" --- crates/hir_def/src/nameres.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'crates/hir_def/src/nameres.rs') diff --git a/crates/hir_def/src/nameres.rs b/crates/hir_def/src/nameres.rs index 9839761d1..6169b3bbc 100644 --- a/crates/hir_def/src/nameres.rs +++ b/crates/hir_def/src/nameres.rs @@ -201,10 +201,8 @@ impl DefMap { let block: BlockLoc = db.lookup_intern_block(block_id); let parent = block.module.def_map(db); - let item_tree = db.item_tree(block.ast_id.file_id); - if item_tree.inner_items_of_block(block.ast_id.value).is_empty() { - return parent.clone(); - } + // FIXME: It would be good to just return the parent map when the block has no items, but + // we rely on `def_map.block` in a few places, which is `Some` for the inner `DefMap`. let block_info = BlockInfo { block: block_id, parent, parent_module: block.module.local_id }; -- cgit v1.2.3