nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-01 19:23:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shortcut block_def_map if there's no inner items

Browse Source 
This previously didn't work, but apparently only because of the wonky
test setup
This commit is contained in:
Jonas Schievink 2021-02-01 13:32:43 +01:00
parent 80ae583dc0
commit b4aa860cac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/hir_def/src/nameres.rs
View File

@ -201,8 +201,10 @@ impl DefMap {
let block: BlockLoc = db.lookup_intern_block(block_id);
let parent = block.module.def_map(db);
// 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 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();
}
let block_info =
BlockInfo { block: block_id, parent, parent_module: block.module.local_id };