diff options
Diffstat (limited to 'crates/hir_expand/src/eager.rs')
-rw-r--r-- | crates/hir_expand/src/eager.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/crates/hir_expand/src/eager.rs b/crates/hir_expand/src/eager.rs index 9093255f4..07799ed2f 100644 --- a/crates/hir_expand/src/eager.rs +++ b/crates/hir_expand/src/eager.rs | |||
@@ -128,7 +128,7 @@ pub fn expand_eager_macro( | |||
128 | }), | 128 | }), |
129 | kind: MacroCallKind::FnLike { ast_id: call_id, fragment: FragmentKind::Expr }, | 129 | kind: MacroCallKind::FnLike { ast_id: call_id, fragment: FragmentKind::Expr }, |
130 | }); | 130 | }); |
131 | let arg_file_id: MacroCallId = arg_id.into(); | 131 | let arg_file_id: MacroCallId = arg_id; |
132 | 132 | ||
133 | let parsed_args = | 133 | let parsed_args = |
134 | diagnostic_sink.result(mbe::token_tree_to_syntax_node(&parsed_args, FragmentKind::Expr))?.0; | 134 | diagnostic_sink.result(mbe::token_tree_to_syntax_node(&parsed_args, FragmentKind::Expr))?.0; |
@@ -182,8 +182,7 @@ fn lazy_expand( | |||
182 | db, | 182 | db, |
183 | krate, | 183 | krate, |
184 | MacroCallKind::FnLike { ast_id: macro_call.with_value(ast_id), fragment }, | 184 | MacroCallKind::FnLike { ast_id: macro_call.with_value(ast_id), fragment }, |
185 | ) | 185 | ); |
186 | .into(); | ||
187 | 186 | ||
188 | let err = db.macro_expand_error(id); | 187 | let err = db.macro_expand_error(id); |
189 | let value = db.parse_or_expand(id.as_file()).map(|node| InFile::new(id.as_file(), node)); | 188 | let value = db.parse_or_expand(id.as_file()).map(|node| InFile::new(id.as_file(), node)); |
@@ -216,8 +215,7 @@ fn eager_macro_recur( | |||
216 | def, | 215 | def, |
217 | macro_resolver, | 216 | macro_resolver, |
218 | diagnostic_sink, | 217 | diagnostic_sink, |
219 | )? | 218 | )?; |
220 | .into(); | ||
221 | db.parse_or_expand(id.as_file()) | 219 | db.parse_or_expand(id.as_file()) |
222 | .expect("successful macro expansion should be parseable") | 220 | .expect("successful macro expansion should be parseable") |
223 | .clone_for_update() | 221 | .clone_for_update() |