From 45dd90b0e8d54fe0467f9e0f886c7c05d2400eb0 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 5 Feb 2020 11:46:05 +0100
Subject: Cleanup

---
 crates/ra_assists/src/assists/merge_match_arms.rs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/crates/ra_assists/src/assists/merge_match_arms.rs b/crates/ra_assists/src/assists/merge_match_arms.rs
index aca391155..885d5036d 100644
--- a/crates/ra_assists/src/assists/merge_match_arms.rs
+++ b/crates/ra_assists/src/assists/merge_match_arms.rs
@@ -1,6 +1,7 @@
-use crate::{Assist, AssistCtx, AssistId, TextRange, TextUnit};
 use hir::db::HirDatabase;
-use ra_syntax::ast::{AstNode, MatchArm};
+use ra_syntax::ast::{self, AstNode};
+
+use crate::{Assist, AssistCtx, AssistId, TextRange, TextUnit};
 
 // Assist: merge_match_arms
 //
@@ -27,12 +28,12 @@ use ra_syntax::ast::{AstNode, MatchArm};
 // }
 // ```
 pub(crate) fn merge_match_arms(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
-    let current_arm = ctx.find_node_at_offset::<MatchArm>()?;
+    let current_arm = ctx.find_node_at_offset::<ast::MatchArm>()?;
 
     // We check if the following match arm matches this one. We could, but don't,
     // compare to the previous match arm as well.
     let next = current_arm.syntax().next_sibling();
-    let next_arm = MatchArm::cast(next?)?;
+    let next_arm = ast::MatchArm::cast(next?)?;
 
     // Don't try to handle arms with guards for now - can add support for this later
     if current_arm.guard().is_some() || next_arm.guard().is_some() {
@@ -53,13 +54,6 @@ pub(crate) fn merge_match_arms(ctx: AssistCtx<impl HirDatabase>) -> Option<Assis
     let cursor_to_end = current_arm.syntax().text_range().end() - ctx.frange.range.start();
 
     ctx.add_assist(AssistId("merge_match_arms"), "Merge match arms", |edit| {
-        fn contains_placeholder(a: &MatchArm) -> bool {
-            a.pats().any(|x| match x {
-                ra_syntax::ast::Pat::PlaceholderPat(..) => true,
-                _ => false,
-            })
-        }
-
         let pats = if contains_placeholder(&current_arm) || contains_placeholder(&next_arm) {
             "_".into()
         } else {
@@ -83,6 +77,13 @@ pub(crate) fn merge_match_arms(ctx: AssistCtx<impl HirDatabase>) -> Option<Assis
     })
 }
 
+fn contains_placeholder(a: &ast::MatchArm) -> bool {
+    a.pats().any(|x| match x {
+        ra_syntax::ast::Pat::PlaceholderPat(..) => true,
+        _ => false,
+    })
+}
+
 #[cfg(test)]
 mod tests {
     use super::merge_match_arms;
-- 
cgit v1.2.3