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

conflicts: relax from_legacy_form() to accept any iterable

Browse source 
This will help to rewrite refs::merge_ref_targets() to leverage Conflict
type. I'm not pretty sure if we'll want to do that, but this change seems
also good for the existing code.
This commit is contained in:
Yuya Nishihara 2023-07-07 19:40:07 +09:00
parent afb1e1693e
commit 9140e5b686
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/src/conflicts.rs
View file

@ -54,7 +54,10 @@ impl<T> Conflict<T> {
/// Create a `Conflict` from a `removes` and `adds`, padding with `None` to
/// make sure that there is exactly one more `adds` than `removes`.
pub fn from_legacy_form(removes: Vec<T>, adds: Vec<T>) -> Conflict<Option<T>> {
pub fn from_legacy_form(
removes: impl IntoIterator<Item = T>,
adds: impl IntoIterator<Item = T>,
) -> Conflict<Option<T>> {
let mut removes = removes.into_iter().map(Some).collect_vec();
let mut adds = adds.into_iter().map(Some).collect_vec();
while removes.len() + 1 < adds.len() {
@ -196,12 +199,8 @@ impl Conflict<Option<TreeValue>> {
/// Create a `Conflict` from a `backend::Conflict`, padding with `None` to
/// make sure that there is exactly one more `adds()` than `removes()`.
pub fn from_backend_conflict(conflict: backend::Conflict) -> Self {
let removes = conflict
.removes
.into_iter()
.map(|term| term.value)
.collect();
let adds = conflict.adds.into_iter().map(|term| term.value).collect();
let removes = conflict.removes.into_iter().map(|term| term.value);
let adds = conflict.adds.into_iter().map(|term| term.value);
Conflict::from_legacy_form(removes, adds)
}