diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-24 21:01:33 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-11-24 21:01:33 +0000 |
commit | 5478aaebfe4d9d2ad7745702932bf40b2cad226b (patch) | |
tree | f28435190d7f830acb6335da5eeaa83a458b5e2a /crates/hir_expand/src/lib.rs | |
parent | e2d8e1120fbf99d40e8b69039b5e25e788365779 (diff) | |
parent | 9559bce311c3b6b7009b9cd09e52c75497c87035 (diff) |
Merge #6630
6630: followup to "hir_expand: propagate expansion errors" r=jonas-schievink a=jonas-schievink
https://github.com/rust-analyzer/rust-analyzer/pull/6625
bors r+ :robot:
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_expand/src/lib.rs')
-rw-r--r-- | crates/hir_expand/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs index 9fc697d6f..83e09738b 100644 --- a/crates/hir_expand/src/lib.rs +++ b/crates/hir_expand/src/lib.rs | |||
@@ -144,7 +144,7 @@ impl HirFileId { | |||
144 | let def_tt = loc.def.ast_id?.to_node(db).token_tree()?; | 144 | let def_tt = loc.def.ast_id?.to_node(db).token_tree()?; |
145 | 145 | ||
146 | let macro_def = db.macro_def(loc.def)?; | 146 | let macro_def = db.macro_def(loc.def)?; |
147 | let (parse, exp_map) = db.parse_macro(macro_file).value?; | 147 | let (parse, exp_map) = db.parse_macro_expansion(macro_file).value?; |
148 | let macro_arg = db.macro_arg(macro_file.macro_call_id)?; | 148 | let macro_arg = db.macro_arg(macro_file.macro_call_id)?; |
149 | 149 | ||
150 | Some(ExpansionInfo { | 150 | Some(ExpansionInfo { |