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

conflicts: move repeated definition of c() in tests to module level

Browse source 
Also remove an obsolete "Irreducible" in a comment.
This commit is contained in:
Martin von Zweigbergk 2023-07-07 05:48:59 -07:00 committed by Martin von Zweigbergk
parent 2bc58ebacf
commit 7bcb01ae5e
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/src/conflicts.rs
View file

@ -646,6 +646,10 @@ fn parse_conflict_hunk(input: &[u8]) -> Conflict<ContentHunk> {
mod tests {
use super::*;
fn c<T: Clone>(removes: &[T], adds: &[T]) -> Conflict<T> {
Conflict::new(removes.to_vec(), adds.to_vec())
}
#[test]
fn test_legacy_form_conversion() {
fn test_equivalent<T>(legacy_form: (Vec<T>, Vec<T>), conflict: Conflict<Option<T>>)
@ -696,9 +700,6 @@ mod tests {
#[test]
fn test_simplify() {
fn c(removes: &[u32], adds: &[u32]) -> Conflict<u32> {
Conflict::new(removes.to_vec(), adds.to_vec())
}
// 1-way "conflict"
assert_eq!(c(&[], &[0]).simplify(), c(&[], &[0]));
// 3-way conflict
@ -707,7 +708,7 @@ mod tests {
assert_eq!(c(&[0], &[1, 0]).simplify(), c(&[], &[1]));
assert_eq!(c(&[0], &[1, 1]).simplify(), c(&[0], &[1, 1]));
assert_eq!(c(&[0], &[1, 2]).simplify(), c(&[0], &[1, 2]));
// Irreducible 5-way conflict
// 5-way conflict
assert_eq!(c(&[0, 0], &[0, 0, 0]).simplify(), c(&[], &[0]));
assert_eq!(c(&[0, 0], &[0, 0, 1]).simplify(), c(&[], &[1]));
assert_eq!(c(&[0, 0], &[0, 1, 0]).simplify(), c(&[], &[1]));
@ -804,9 +805,6 @@ mod tests {
fn increment(i: &i32) -> i32 {
i + 1
}
fn c(removes: &[i32], adds: &[i32]) -> Conflict<i32> {
Conflict::new(removes.to_vec(), adds.to_vec())
}
// 1-way conflict
assert_eq!(c(&[], &[1]).map(increment), c(&[], &[2]));
// 3-way conflict
@ -822,9 +820,6 @@ mod tests {
None
}
}
fn c(removes: &[i32], adds: &[i32]) -> Conflict<i32> {
Conflict::new(removes.to_vec(), adds.to_vec())
}
// 1-way conflict
assert_eq!(c(&[], &[1]).maybe_map(sqrt), Some(c(&[], &[1])));
assert_eq!(c(&[], &[-1]).maybe_map(sqrt), None);
@ -843,9 +838,6 @@ mod tests {
Err(())
}
}
fn c(removes: &[i32], adds: &[i32]) -> Conflict<i32> {
Conflict::new(removes.to_vec(), adds.to_vec())
}
// 1-way conflict
assert_eq!(c(&[], &[1]).try_map(sqrt), Ok(c(&[], &[1])));
assert_eq!(c(&[], &[-1]).try_map(sqrt), Err(()));
@ -857,9 +849,6 @@ mod tests {
#[test]
fn test_flatten() {
fn c<T: Clone>(removes: &[T], adds: &[T]) -> Conflict<T> {
Conflict::new(removes.to_vec(), adds.to_vec())
}
// 1-way conflict of 1-way conflict
assert_eq!(c(&[], &[c(&[], &[0])]).flatten(), c(&[], &[0]));
// 1-way conflict of 3-way conflict