ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

conflicts: use an early return to reduce indentation

Browse source 
Thanks to @ilyagr for the suggestion.
This commit is contained in:
Martin von Zweigbergk 2023-06-03 20:26:53 -07:00 committed by Martin von Zweigbergk
parent f4499aa65e
commit 9907cccf37
1 changed files with 74 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/src/conflicts.rs
View file

@ -464,7 +464,15 @@ pub fn update_conflict_from_content(
// further down. // further down.
let mut removed_content = vec![vec![]; conflict.removes().len()]; let mut removed_content = vec![vec![]; conflict.removes().len()];
let mut added_content = vec![vec![]; conflict.adds().len()]; let mut added_content = vec![vec![]; conflict.adds().len()];
if let Some(hunks) = parse_conflict(content, conflict.removes().len(), conflict.adds().len()) { // TODO: Change to let-else once our MSRV is above 1.65
let hunks = if let Some(hunks) =
parse_conflict(content, conflict.removes().len(), conflict.adds().len())
{
hunks
} else {
// Either there are no conflict markers of they don't have the expected arity
return Ok(None);
};
for hunk in hunks { for hunk in hunks {
match hunk { match hunk {
MergeHunk::Resolved(slice) => { MergeHunk::Resolved(slice) => {
@ -532,9 +540,6 @@ pub fn update_conflict_from_content(
} }
let new_conflict_id = store.write_conflict(path, &conflict.to_backend_conflict())?; let new_conflict_id = store.write_conflict(path, &conflict.to_backend_conflict())?;
Ok(Some(new_conflict_id)) Ok(Some(new_conflict_id))
} else {
Ok(None)
}
} }
#[cfg(test)] #[cfg(test)]