diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2022-03-05 21:58:51 +0100 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2022-03-05 21:58:51 +0100 |
| commit | bb47c5f56c2f6d389879973d6b98fa487b4457fb (patch) | |
| tree | fc29a417ff3f10bf2f43df30106d331eff10c8cc | |
| parent | f8329ba98731a939fe2c6eb878778a6399274ff0 (diff) | |
| download | rust-bb47c5f56c2f6d389879973d6b98fa487b4457fb.tar.gz rust-bb47c5f56c2f6d389879973d6b98fa487b4457fb.zip | |
fix: Fix macro-calls expanding to items in if/while conditions
| -rw-r--r-- | crates/hir_def/src/body/lower.rs | 16 | ||||
| -rw-r--r-- | crates/hir_expand/src/lib.rs | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs index 06ad7ce4cd0..195f21cedc3 100644 --- a/crates/hir_def/src/body/lower.rs +++ b/crates/hir_def/src/body/lower.rs @@ -500,14 +500,14 @@ impl ExprCollector<'_> { } ast::Expr::MacroCall(e) => { let macro_ptr = AstPtr::new(&e); - let mut ids = vec![]; + let mut ids = None; self.collect_macro_call(e, macro_ptr, true, |this, expansion| { - ids.push(match expansion { + ids.get_or_insert(match expansion { Some(it) => this.collect_expr(it), None => this.alloc_expr(Expr::Missing, syntax_ptr.clone()), - }) + }); }); - ids[0] + ids.unwrap_or_else(|| self.alloc_expr(Expr::Missing, syntax_ptr.clone())) } ast::Expr::MacroStmts(e) => { e.statements().for_each(|s| self.collect_stmt(s)); @@ -523,7 +523,7 @@ impl ExprCollector<'_> { fn collect_macro_call<F: FnMut(&mut Self, Option<T>), T: ast::AstNode>( &mut self, - e: ast::MacroCall, + mcall: ast::MacroCall, syntax_ptr: AstPtr<ast::MacroCall>, record_diagnostics: bool, mut collector: F, @@ -531,8 +531,8 @@ impl ExprCollector<'_> { // File containing the macro call. Expansion errors will be attached here. let outer_file = self.expander.current_file_id; - let macro_call = self.expander.to_source(AstPtr::new(&e)); - let res = self.expander.enter_expand(self.db, e); + let macro_call_ptr = self.expander.to_source(AstPtr::new(&mcall)); + let res = self.expander.enter_expand(self.db, mcall); let res = match res { Ok(res) => res, @@ -567,7 +567,7 @@ impl ExprCollector<'_> { match res.value { Some((mark, expansion)) => { - self.source_map.expansions.insert(macro_call, self.expander.current_file_id); + self.source_map.expansions.insert(macro_call_ptr, self.expander.current_file_id); let id = collector(self, Some(expansion)); self.expander.exit(self.db, mark); diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs index ba0f1015124..649a160b33b 100644 --- a/crates/hir_expand/src/lib.rs +++ b/crates/hir_expand/src/lib.rs @@ -894,7 +894,7 @@ impl ExpandTo { | CLOSURE_EXPR | BREAK_EXPR | RETURN_EXPR | MATCH_EXPR | MATCH_ARM | MATCH_GUARD | RECORD_EXPR_FIELD | CALL_EXPR | INDEX_EXPR | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | CAST_EXPR | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR - | LET_EXPR => ExpandTo::Expr, + | LET_EXPR | IF_EXPR | WHILE_EXPR => ExpandTo::Expr, LET_STMT => { // FIXME: Handle LHS Pattern ExpandTo::Expr |