mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-19 19:08:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This makes the code a bit easier to follow in my opinion.
This commit is contained in:
Scott Taylor 2024-11-16 11:23:48 -06:00 committed by Scott Taylor
parent e5cb9f94f6
commit 3c182687e8
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/src/conflicts.rs
View file

@ -300,9 +300,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)?;