diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-24 18:01:49 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-11-24 18:01:49 +0000 |
commit | e2d8e1120fbf99d40e8b69039b5e25e788365779 (patch) | |
tree | 12fc2464ad36452481fd29b9a174840be3765dd2 /crates/hir_expand/src/lib.rs | |
parent | d2f398cd76659425c9d48185a1be92ee9a9332c2 (diff) | |
parent | d5e9bf80f9e68cabf694226e2bad896c1ee00742 (diff) |
Merge #6625
6625: hir_expand: propagate expansion errors r=jonas-schievink a=jonas-schievink
This is needed to collect and report expansion errors later.
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 17f1178ed..9fc697d6f 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)?; | 147 | let (parse, exp_map) = db.parse_macro(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 { |