about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJeroen Vannevel <jer_vannevel@outlook.com>2022-01-11 21:50:42 +0000
committerJeroen Vannevel <jer_vannevel@outlook.com>2022-01-14 01:32:11 +0000
commit7daca6fe9733b64a2610c337c191785e12103ed0 (patch)
tree868598549f343de616e42cf144630b94f1dafd39
parent08300284e7632476592a715d28653db83bdef686 (diff)
downloadrust-7daca6fe9733b64a2610c337c191785e12103ed0.tar.gz
rust-7daca6fe9733b64a2610c337c191785e12103ed0.zip
cleaning up Some
-rw-r--r--crates/ide_assists/src/handlers/merge_match_arms.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/crates/ide_assists/src/handlers/merge_match_arms.rs b/crates/ide_assists/src/handlers/merge_match_arms.rs
index f5366bee121..54de1c6c2fb 100644
--- 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;
                 }