bendns' repos / dmp
my fork of dmp
Diffstat (limited to 'src/traits.rs')
-rw-r--r--src/traits.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/traits.rs b/src/traits.rs
index 191f8dc..91e0a6b 100644
--- a/src/traits.rs
+++ b/src/traits.rs
@@ -2,14 +2,14 @@ use chrono::NaiveTime;
use crate::dmp::{Diff, DiffMatchPatch};
-pub(crate) trait BisectSplit: Copy + Ord + Eq {
+pub trait BisectSplit: Copy + Ord + Eq {
fn bisect_split(
dmp: &DiffMatchPatch,
old: &[Self],
new: &[Self],
x: usize,
y: usize,
- start: NaiveTime,
+ deadline: Option<NaiveTime>,
) -> Result<Vec<Diff<Self>>, crate::errors::Error>;
}
@@ -20,7 +20,7 @@ impl BisectSplit for u8 {
new: &[u8],
x: usize,
y: usize,
- start: NaiveTime,
+ deadline: Option<NaiveTime>
) -> Result<Vec<Diff<u8>>, crate::errors::Error> {
let old_a = &old[..x];
let new_a = &new[..y];
@@ -29,8 +29,8 @@ impl BisectSplit for u8 {
let new_b = &new[y..];
// Compute both diffs serially.
- let mut diffs_a = dmp.diff_internal(old_a, new_a, false, start)?;
- diffs_a.append(&mut dmp.diff_internal(old_b, new_b, false, start)?);
+ let mut diffs_a = dmp.diff_internal(old_a, new_a, false, deadline)?;
+ diffs_a.append(&mut dmp.diff_internal(old_b, new_b, false, deadline)?);
Ok(diffs_a)
}
@@ -43,7 +43,7 @@ impl BisectSplit for usize {
new: &[usize],
x: usize,
y: usize,
- start: NaiveTime,
+ deadline: Option<NaiveTime>,
) -> Result<Vec<Diff<usize>>, crate::errors::Error> {
let old_a = &old[..x];
let new_a = &new[..y];
@@ -52,8 +52,8 @@ impl BisectSplit for usize {
let new_b = &new[y..];
// Compute both diffs serially.
- let mut diffs_a = dmp.diff_lines(old_a, new_a, start)?;
- diffs_a.append(&mut dmp.diff_lines(old_b, new_b, start)?);
+ let mut diffs_a = dmp.diff_lines(old_a, new_a, deadline)?;
+ diffs_a.append(&mut dmp.diff_lines(old_b, new_b, deadline)?);
Ok(diffs_a)
}