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

conflicts: avoid unnecessary cloning of conflict content

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-06-27 02:28:47 -07:00 committed by Martin von Zweigbergk
parent 777b786c53
commit b3946be414
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/src/conflicts.rs
View file

@ -247,11 +247,11 @@ impl Conflict<Option<TreeValue>> {
}
}
MergeHunk::Conflict(ConflictHunk { removes, adds }) => {
for (i, buf) in removes.iter().enumerate() {
removed_content[i].extend_from_slice(buf);
for (i, buf) in removes.into_iter().enumerate() {
removed_content[i].extend(buf);
}
for (i, buf) in adds.iter().enumerate() {
added_content[i].extend_from_slice(buf);
for (i, buf) in adds.into_iter().enumerate() {
added_content[i].extend(buf);
}
}
}