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

refactor: remove body parameter for "unnecessary else" diagnostic

Browse source
This commit is contained in:
davidsemakula 2024-02-19 15:35:47 +03:00
parent 7dfeb2cdcc
commit f2218e7278
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/hir-ty/src/diagnostics/expr.rs
View file

@ -109,7 +109,7 @@ impl ExprValidator {
self.check_for_trailing_return(*body_expr, &body); self.check_for_trailing_return(*body_expr, &body);
} }
Expr::If { .. } => { Expr::If { .. } => {
self.check_for_unnecessary_else(id, expr, &body, db); self.check_for_unnecessary_else(id, expr, db);
} }
Expr::Block { .. } => { Expr::Block { .. } => {
self.validate_block(db, expr); self.validate_block(db, expr);
@ -337,18 +337,12 @@ impl ExprValidator {
} }
} }
fn check_for_unnecessary_else( fn check_for_unnecessary_else(&mut self, id: ExprId, expr: &Expr, db: &dyn HirDatabase) {
&mut self,
id: ExprId,
expr: &Expr,
body: &Body,
db: &dyn HirDatabase,
) {
if let Expr::If { condition: _, then_branch, else_branch } = expr { if let Expr::If { condition: _, then_branch, else_branch } = expr {
if else_branch.is_none() { if else_branch.is_none() {
return; return;
} }
if let Expr::Block { statements, tail, .. } = &body.exprs[*then_branch] { if let Expr::Block { statements, tail, .. } = &self.body.exprs[*then_branch] {
let last_then_expr = tail.or_else(|| match statements.last()? { let last_then_expr = tail.or_else(|| match statements.last()? {
Statement::Expr { expr, .. } => Some(*expr), Statement::Expr { expr, .. } => Some(*expr),
_ => None, _ => None,