language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update hir-ty test outputs

Browse source
This commit is contained in:
Lukas Wirth 2022-07-01 15:04:58 +02:00
parent 531e152390
commit 9165e3b381
4 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/hir-def/src/body/lower.rs
View file

@ -631,7 +631,6 @@ impl ExprCollector<'_> {
let mac_call = mac.macro_call()?;
let syntax_ptr = AstPtr::new(expr);
let macro_ptr = AstPtr::new(&mac_call);
// let prev_stmt = self.statements_in_scope.len();
let stmt = self.collect_macro_call(
mac_call,
macro_ptr,

3
crates/hir-def/src/body/scope.rs
View file

@ -175,6 +175,9 @@ fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope
scopes.set_scope(expr, *scope);
match &body[expr] {
Expr::MacroStmts { statements, tail } => {
compute_block_scopes(statements, *tail, body, scopes, *scope);
}
Expr::Block { statements, tail, id, label } => {
let scope = scopes.new_block_scope(*scope, *id, make_label(label));
// Overwrite the old scope for the block expr, so that every block scope can be found