1 files changed, 6 insertions, 20 deletions

diff --git a/crates/ra_ide_api_light/src/assists/replace_if_let_with_match.rs b/crates/ra_ide_api_light/src/assists/replace_if_let_with_match.rs
index 30c371480..d64c34d54 100644
--- a/crates/ra_ide_api_light/src/assists/replace_if_let_with_match.rs
+++ b/crates/ra_ide_api_light/src/assists/replace_if_let_with_match.rs
@@ -1,9 +1,9 @@
-use ra_syntax::{
-    AstNode, SyntaxKind::{L_CURLY, R_CURLY, WHITESPACE},
-    ast,
-};
+use ra_syntax::{AstNode, ast};
 
-use crate::assists::{AssistCtx, Assist};
+use crate::{
+    assists::{AssistCtx, Assist},
+    formatting::extract_trivial_expression,
+};
 
 pub fn replace_if_let_with_match(ctx: AssistCtx) -> Option<Assist> {
     let if_expr: &ast::IfExpr = ctx.node_at_offset()?;
@@ -39,26 +39,12 @@ fn build_match_expr(
 }
 
 fn format_arm(block: &ast::Block) -> String {
-    match extract_expression(block) {
+    match extract_trivial_expression(block) {
         None => block.syntax().text().to_string(),
         Some(e) => format!("{},", e.syntax().text()),
     }
 }
 
-fn extract_expression(block: &ast::Block) -> Option<&ast::Expr> {
-    let expr = block.expr()?;
-    let non_trivial_children = block.syntax().children().filter(|it| {
-        !(it == &expr.syntax()
-            || it.kind() == L_CURLY
-            || it.kind() == R_CURLY
-            || it.kind() == WHITESPACE)
-    });
-    if non_trivial_children.count() > 0 {
-        return None;
-    }
-    Some(expr)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;