From 9c74a5b2c02a14a2e2683962fe667f30211ddda0 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 2 Oct 2021 15:24:32 +0300 Subject: [PATCH] minor: reduce duplication --- .../ide_assists/src/handlers/replace_if_let_with_match.rs | 6 +----- 1 file changed, 1 insertion(+), 5 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 3a89c2b996c..019e8b61607 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 @@ -210,11 +210,7 @@ pub(crate) fn replace_match_with_if_let(acc: &mut Assists, ctx: &AssistContext) ast::Expr::BlockExpr(block) => block, expr => make::block_expr(iter::empty(), Some(expr)), }; - let else_expr = match else_expr { - ast::Expr::BlockExpr(block) if block.is_empty() => None, - ast::Expr::TupleExpr(tuple) if tuple.fields().next().is_none() => None, - expr => Some(expr), - }; + let else_expr = if is_empty_expr(&else_expr) { None } else { Some(else_expr) }; let if_let_expr = make::expr_if( condition, then_block,