nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-12 16:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

battle of the Some

Browse Source
This commit is contained in:
Jeroen Vannevel 2022-01-11 21:53:39 +00:00
parent 7daca6fe97
commit a347cb5f86
No known key found for this signature in database
GPG Key ID: 78EF5F52F38C49BD
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ide_assists/src/handlers/merge_match_arms.rs
View File

@ -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