cleaning up Some

diff --git a/crates/ide_assists/src/handlers/merge_match_arms.rs b/crates/ide_assists/src/handlers/merge_match_arms.rs
index f5366bee1216fae5f9764881e55de50d9905729a..54de1c6c2fb79619f3d4b38ece7d8833529807d4 100644 (file)
--- a/crates/ide_assists/src/handlers/merge_match_arms.rs
+++ b/crates/ide_assists/src/handlers/merge_match_arms.rs
@@ -100,12 +100,9 @@ fn are_same_types(
     ctx: &AssistContext,
 ) -> bool {
     let arm_types = get_arm_types(&ctx, &arm);
-    for other_arm_type_entry in arm_types {
-        let current_arm_type_kv = current_arm_types.get_key_value(&other_arm_type_entry.0);
-        if let Some(current_arm_type) = current_arm_type_kv {
-            if let (Some(other_arm_type), Some(current_arm_type)) =
-                (other_arm_type_entry.1, current_arm_type.1)
-            {
+    for (other_arm_type_name, other_arm_type) in arm_types {
+        if let Some((_, Some(current_arm_type))) = current_arm_types.get_key_value(&other_arm_type_name) {
+            if let Some(other_arm_type) = other_arm_type {
                 if other_arm_type.original != current_arm_type.original {
                     return false;
                 }