Unnamed repository; edit this file 'description' to name the repository.
internal: remove deprecated method
| -rw-r--r-- | crates/ide_assists/src/handlers/replace_if_let_with_match.rs | 5 | ||||
| -rw-r--r-- | crates/syntax/src/ast/node_ext.rs | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/ide_assists/src/handlers/replace_if_let_with_match.rs b/crates/ide_assists/src/handlers/replace_if_let_with_match.rs index 019e8b6160..22675fbee0 100644 --- a/crates/ide_assists/src/handlers/replace_if_let_with_match.rs +++ b/crates/ide_assists/src/handlers/replace_if_let_with_match.rs @@ -253,7 +253,10 @@ fn pick_pattern_and_expr_order( fn is_empty_expr(expr: &ast::Expr) -> bool { match expr { - ast::Expr::BlockExpr(expr) => expr.is_empty(), + ast::Expr::BlockExpr(expr) => match expr.stmt_list() { + Some(it) => it.statements().next().is_none() && it.tail_expr().is_none(), + None => true, + }, ast::Expr::TupleExpr(expr) => expr.fields().next().is_none(), _ => false, } diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs index a07f02e445..c0352f9b13 100644 --- a/crates/syntax/src/ast/node_ext.rs +++ b/crates/syntax/src/ast/node_ext.rs @@ -58,9 +58,6 @@ impl ast::BlockExpr { self.stmt_list().into_iter().flat_map(|it| it.items()) } - pub fn is_empty(&self) -> bool { - self.statements().next().is_none() && self.tail_expr().is_none() - } pub fn statements(&self) -> impl Iterator<Item = ast::Stmt> { self.stmt_list().into_iter().flat_map(|it| it.statements()) } |