andras/reconcile
andras/reconcile
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix lint

Browse source
This commit is contained in:
Andras Schmelczer 2025-02-19 21:43:21 +00:00
commit 6f05fc2b93
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backend/reconcile/src/diffs/myers.rs
View file

@ -40,7 +40,7 @@ pub fn diff<T>(old: &[Token<T>], new: &[Token<T>]) -> Vec<RawOperation<T>>
where where
T: PartialEq + Clone, T: PartialEq + Clone,
{ {
let max_d = max_d(old.len(), new.len()); let max_d = (old.len() + new.len()).div_ceil(2);
let mut vb = V::new(max_d); let mut vb = V::new(max_d);
let mut vf = V::new(max_d); let mut vf = V::new(max_d);
let mut result: Vec<RawOperation<T>> = vec![]; let mut result: Vec<RawOperation<T>> = vec![];
@ -99,11 +99,6 @@ impl IndexMut<isize> for V {
} }
} }
fn max_d(len1: usize, len2: usize) -> usize {
// XXX look into reducing the need to have the additional '+ 1'
(len1 + len2 + 1) / 2 + 1
}
#[inline(always)] #[inline(always)]
fn split_at(range: Range<usize>, at: usize) -> (Range<usize>, Range<usize>) { fn split_at(range: Range<usize>, at: usize) -> (Range<usize>, Range<usize>) {
(range.start..at, at..range.end) (range.start..at, at..range.end)
@ -145,7 +140,7 @@ where
vb[1] = 0; vb[1] = 0;
// We only need to explore ceil(D/2) + 1 // We only need to explore ceil(D/2) + 1
let d_max = max_d(n, m); let d_max = (n + m).div_ceil(2);
assert!(vf.len() >= d_max); assert!(vf.len() >= d_max);
assert!(vb.len() >= d_max); assert!(vb.len() >= d_max);