Unnamed repository; edit this file 'description' to name the repository.
battle of the Some
| -rw-r--r-- | crates/ide_assists/src/handlers/merge_match_arms.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ide_assists/src/handlers/merge_match_arms.rs b/crates/ide_assists/src/handlers/merge_match_arms.rs index 54de1c6c2f..0ef4678d11 100644 --- a/crates/ide_assists/src/handlers/merge_match_arms.rs +++ b/crates/ide_assists/src/handlers/merge_match_arms.rs @@ -101,11 +101,11 @@ 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))) = 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; - } + if let (Some(Some(current_arm_type)), Some(other_arm_type)) = + (current_arm_types.get(&other_arm_type_name), other_arm_type) + { + if other_arm_type.original != current_arm_type.original { + return false; } } else { // No corresponding field found |