bendns' repos / dmp
my fork of dmp
Diffstat (limited to 'src/traits.rs')
-rw-r--r--src/traits.rs20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/traits.rs b/src/traits.rs
index 5d0a424..191f8dc 100644
--- a/src/traits.rs
+++ b/src/traits.rs
@@ -1,8 +1,4 @@
-#[cfg(target_arch = "wasm32")]
-use instant::Instant;
-
-#[cfg(not(target_arch = "wasm32"))]
-use std::time::Instant;
+use chrono::NaiveTime;
use crate::dmp::{Diff, DiffMatchPatch};
@@ -13,7 +9,7 @@ pub(crate) trait BisectSplit: Copy + Ord + Eq {
new: &[Self],
x: usize,
y: usize,
- deadline: Instant,
+ start: NaiveTime,
) -> Result<Vec<Diff<Self>>, crate::errors::Error>;
}
@@ -24,7 +20,7 @@ impl BisectSplit for u8 {
new: &[u8],
x: usize,
y: usize,
- deadline: Instant,
+ start: NaiveTime,
) -> Result<Vec<Diff<u8>>, crate::errors::Error> {
let old_a = &old[..x];
let new_a = &new[..y];
@@ -33,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, deadline)?;
- diffs_a.append(&mut dmp.diff_internal(old_b, new_b, false, deadline)?);
+ 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)?);
Ok(diffs_a)
}
@@ -47,7 +43,7 @@ impl BisectSplit for usize {
new: &[usize],
x: usize,
y: usize,
- deadline: Instant,
+ start: NaiveTime,
) -> Result<Vec<Diff<usize>>, crate::errors::Error> {
let old_a = &old[..x];
let new_a = &new[..y];
@@ -56,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, deadline)?;
- diffs_a.append(&mut dmp.diff_lines(old_b, new_b, deadline)?);
+ let mut diffs_a = dmp.diff_lines(old_a, new_a, start)?;
+ diffs_a.append(&mut dmp.diff_lines(old_b, new_b, start)?);
Ok(diffs_a)
}