diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-02 10:47:22 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-02 10:47:22 +0000 |
| commit | 157156276b32c4edca337e6389dc70a203c7c681 (patch) | |
| tree | 4424b450134591652648d4709715655975fe3ba7 /crates/hir_def/src/data.rs | |
| parent | 3c1fcfcd1b79430c1ea97eea4ce0c89c9c793cdb (diff) | |
| parent | 7202ce6c963f047b8890ee50acc5aaf5d65f175d (diff) | |
Merge #7516
7516: Revert "Use block_def_map in body lowering" r=jonas-schievink a=jonas-schievink
Reverts rust-analyzer/rust-analyzer#7506
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_def/src/data.rs')
| -rw-r--r-- | crates/hir_def/src/data.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_def/src/data.rs b/crates/hir_def/src/data.rs index c2b0dc007..e7b7724f7 100644 --- a/crates/hir_def/src/data.rs +++ b/crates/hir_def/src/data.rs | |||
| @@ -262,7 +262,7 @@ fn collect_items( | |||
| 262 | let root = db.parse_or_expand(file_id).unwrap(); | 262 | let root = db.parse_or_expand(file_id).unwrap(); |
| 263 | let call = ast_id_map.get(call.ast_id).to_node(&root); | 263 | let call = ast_id_map.get(call.ast_id).to_node(&root); |
| 264 | 264 | ||
| 265 | if let Some((mark, mac)) = expander.enter_expand(db, call).value { | 265 | if let Some((mark, mac)) = expander.enter_expand(db, None, call).value { |
| 266 | let src: InFile<ast::MacroItems> = expander.to_source(mac); | 266 | let src: InFile<ast::MacroItems> = expander.to_source(mac); |
| 267 | let item_tree = db.item_tree(src.file_id); | 267 | let item_tree = db.item_tree(src.file_id); |
| 268 | let iter = | 268 | let iter = |