Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove reliance on expr ordering

Browse source
This commit is contained in:
Phil Ellison 2019-08-12 20:21:29 +01:00 committed by Aleksey Kladov
parent 4f6f3933ec
commit c8911e872e
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/ra_hir/src/expr/validation.rs
View file

@ -34,21 +34,15 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
pub(crate) fn validate_body(&mut self, db: &impl HirDatabase) { pub(crate) fn validate_body(&mut self, db: &impl HirDatabase) {
let body = self.func.body(db); let body = self.func.body(db);
// The final expr in the function body is the whole body,
// so the expression being returned is the penultimate expr.
let mut penultimate_expr = None;
let mut final_expr = None;
for e in body.exprs() { for e in body.exprs() {
penultimate_expr = final_expr;
final_expr = Some(e);
if let (id, Expr::RecordLit { path, fields, spread }) = e { if let (id, Expr::RecordLit { path, fields, spread }) = e {
self.validate_record_literal(id, path, fields, *spread, db); self.validate_record_literal(id, path, fields, *spread, db);
} }
} }
if let Some(e) = penultimate_expr {
self.validate_results_in_tail_expr(e.0, db); let body_expr = &body[body.body_expr()];
if let Expr::Block { statements: _, tail: Some(t) } = body_expr {
self.validate_results_in_tail_expr(*t, db);
} }
} }