conflicts: replace "if let" with "let else"

This makes the code a bit easier to follow in my opinion.
scott2000 · Nov 22, 2024 · 47a2bad · 47a2bad
1 parent 60196fb
commit 47a2bad
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/lib/src/conflicts.rs b/lib/src/conflicts.rs
@@ -298,9 +298,7 @@ fn materialize_conflict_hunks(
                     format!("base #{}", base_index + 1)
                 };
 
-                let right1 = if let Some(right1) = hunk.get_add(add_index) {
-                    right1
-                } else {
+                let Some(right1) = hunk.get_add(add_index) else {
                     // If we have no more positive terms, emit the remaining negative
                     // terms as snapshots.
                     output.write_all(CONFLICT_MINUS_LINE)?;