styling fixes

crates/ide_assists/src/handlers/merge_match_arms.rs

@@ -2,7 +2,7 @@ use hir::TypeInfo;
 use std::{collections::HashMap, iter::successors};
 use syntax::{
     algo::neighbor,
-    ast::{self, AstNode, HasName, MatchArm, Pat},
+    ast::{self, AstNode, HasName},
     Direction,
 };
 
@@ -90,7 +90,7 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option
     )
 }
 
-fn contains_placeholder(a: &MatchArm) -> bool {
+fn contains_placeholder(a: &ast::MatchArm) -> bool {
     matches!(a.pat(), Some(ast::Pat::WildcardPat(..)))
 }
 
@@ -101,54 +101,55 @@ fn are_same_types(
 ) -> bool {
     let arm_types = get_arm_types(&ctx, &arm);
     for (other_arm_type_name, other_arm_type) in arm_types {
-        if let (Some(Some(current_arm_type)), Some(other_arm_type)) =
+        match (current_arm_types.get(&other_arm_type_name), other_arm_type) {
-            (current_arm_types.get(&other_arm_type_name), other_arm_type)
+            (Some(Some(current_arm_type)), Some(other_arm_type))
+                if other_arm_type.original == current_arm_type.original =>
             {
-            if other_arm_type.original != current_arm_type.original {
+                ()
-                return false;
             }
-        } else {
+            _ => return false,
-            // No corresponding field found
-            return false;
         }
     }
 
-    return true;
+    true
 }
 
-fn get_arm_types(context: &AssistContext, arm: &MatchArm) -> HashMap<String, Option<TypeInfo>> {
+fn get_arm_types(
+    context: &AssistContext,
+    arm: &ast::MatchArm,
+) -> HashMap<String, Option<TypeInfo>> {
     let mut mapping: HashMap<String, Option<TypeInfo>> = HashMap::new();
 
     fn recurse(
-        pat: &Option<Pat>,
         map: &mut HashMap<String, Option<TypeInfo>>,
         ctx: &AssistContext,
+        pat: &Option<ast::Pat>,
     ) {
         if let Some(local_pat) = pat {
             match pat {
                 Some(ast::Pat::TupleStructPat(tuple)) => {
                     for field in tuple.fields() {
-                        recurse(&Some(field), map, ctx);
+                        recurse(map, ctx, &Some(field));
                     }
                 }
                 Some(ast::Pat::TuplePat(tuple)) => {
                     for field in tuple.fields() {
-                        recurse(&Some(field), map, ctx);
+                        recurse(map, ctx, &Some(field));
                     }
                 }
                 Some(ast::Pat::RecordPat(record)) => {
                     if let Some(field_list) = record.record_pat_field_list() {
                         for field in field_list.fields() {
-                            recurse(&field.pat(), map, ctx);
+                            recurse(map, ctx, &field.pat());
                         }
                     }
                 }
                 Some(ast::Pat::ParenPat(parentheses)) => {
-                    recurse(&parentheses.pat(), map, ctx);
+                    recurse(map, ctx, &parentheses.pat());
                 }
                 Some(ast::Pat::SlicePat(slice)) => {
                     for slice_pat in slice.pats() {
-                        recurse(&Some(slice_pat), map, ctx);
+                        recurse(map, ctx, &Some(slice_pat));
                     }
                 }
                 Some(ast::Pat::IdentPat(ident_pat)) => {
@@ -162,8 +163,8 @@ fn get_arm_types(context: &AssistContext, arm: &MatchArm) -> HashMap<String, Opt
         }
     }
 
-    recurse(&arm.pat(), &mut mapping, &context);
+    recurse(&mut mapping, &context, &arm.pat());
-    return mapping;
+    mapping
 }
 
 #[cfg(test)]
@@ -327,7 +328,8 @@ fn main() {
     fn merge_match_arms_different_type() {
         check_assist_not_applicable(
             merge_match_arms,
-            r#"//- minicore: result
+            r#"
+//- minicore: result
 fn func() {
     match Result::<f64, f32>::Ok(0f64) {
         Ok(x) => $0x.classify(),
@@ -342,7 +344,8 @@ fn func() {
     fn merge_match_arms_different_type_multiple_fields() {
         check_assist_not_applicable(
             merge_match_arms,
-            r#"//- minicore: result
+            r#"
+//- minicore: result
 fn func() {
     match Result::<(f64, f64), (f32, f32)>::Ok((0f64, 0f64)) {
         Ok(x) => $0x.1.classify(),
@@ -357,7 +360,8 @@ fn func() {
     fn merge_match_arms_same_type_multiple_fields() {
         check_assist(
             merge_match_arms,
-            r#"//- minicore: result
+            r#"
+//- minicore: result
 fn func() {
     match Result::<(f64, f64), (f64, f64)>::Ok((0f64, 0f64)) {
         Ok(x) => $0x.1.classify(),
@@ -437,7 +441,8 @@ fn func(e: MyEnum) {
     fn merge_match_arms_same_type_different_number_of_fields() {
         check_assist_not_applicable(
             merge_match_arms,
-            r#"//- minicore: result
+            r#"
+//- minicore: result
 fn func() {
     match Result::<(f64, f64, f64), (f64, f64)>::Ok((0f64, 0f64, 0f64)) {
         Ok(x) => $0x.1.classify(),