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

conflicts: simplify inner loop of simplify() a bit

Browse source
This commit is contained in:
Yuya Nishihara 2023-07-09 13:18:35 +09:00
parent aac5b7aa25
commit afb1e1693e
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/src/conflicts.rs
View file

@ -98,19 +98,13 @@ impl<T> Conflict<T> {
let mut add_index = 0;
while add_index < self.adds.len() {
let add = &self.adds[add_index];
let mut modified = false;
for (remove_index, remove) in self.removes.iter().enumerate() {
if remove == add {
// Move the value to the `add_index-1`th diff, then delete the `remove_index`th
// diff.
self.adds.swap(remove_index + 1, add_index);
self.removes.remove(remove_index);
self.adds.remove(remove_index + 1);
modified = true;
break;
}
}
if !modified {
if let Some(remove_index) = self.removes.iter().position(|remove| remove == add) {
// Move the value to the `add_index-1`th diff, then delete the `remove_index`th
// diff.
self.adds.swap(remove_index + 1, add_index);
self.removes.remove(remove_index);
self.adds.remove(remove_index + 1);
} else {
add_index += 1;
}
}