barrett/likewise
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add wasm tests (#74)

Browse source
This commit is contained in:
Armin Ronacher 2025-01-19 15:36:34 +01:00 • committed by GitHub
parent 2b2881a375
commit 5077768172
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 92 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/text/inline.rs
View file

@ -1,9 +1,9 @@
use std::borrow::Cow;
use std::fmt;
use crate::deadline_support::Instant;
use crate::text::{DiffableStr, TextDiff};
use crate::types::{Algorithm, Change, ChangeTag, DiffOp, DiffTag};
use crate::Instant;
use crate::{capture_diff_deadline, get_diff_ratio};
use std::ops::Index;

14
src/text/mod.rs
View file

@ -15,9 +15,9 @@ pub use self::inline::InlineChange;
use self::utils::{upper_seq_ratio, QuickSeqRatio};
use crate::algorithms::IdentifyDistinct;
use crate::deadline_support::{duration_to_deadline, Instant};
use crate::iter::{AllChangesIter, ChangesIter};
use crate::udiff::UnifiedDiff;
use crate::Instant;
use crate::{capture_diff_deadline, get_diff_ratio, group_diff_ops, Algorithm, DiffOp};
#[derive(Debug, Clone, Copy)]
@ -27,10 +27,10 @@ enum Deadline {
}
impl Deadline {
fn into_instant(self) -> Instant {
fn into_instant(self) -> Option<Instant> {
match self {
Deadline::Absolute(instant) => instant,
Deadline::Relative(duration) => Instant::now() + duration,
Deadline::Absolute(instant) => Some(instant),
Deadline::Relative(duration) => duration_to_deadline(duration),
}
}
}
@ -319,7 +319,7 @@ impl TextDiffConfig {
new: Cow<'bufs, [&'new T]>,
newline_terminated: bool,
) -> TextDiff<'old, 'new, 'bufs, T> {
let deadline = self.deadline.map(|x| x.into_instant());
let deadline = self.deadline.and_then(|x| x.into_instant());
let ops = if old.len() > 100 || new.len() > 100 {
let ih = IdentifyDistinct::<u32>::new(&old[..], 0..old.len(), &new[..], 0..new.len());
capture_diff_deadline(
@ -548,7 +548,9 @@ impl<'old, 'new, 'bufs, T: DiffableStr + ?Sized + 'old + 'new> TextDiff<'old, 'n
where
'slf: 'old + 'new,
{
inline::iter_inline_changes(self, op, Some(Instant::now() + Duration::from_millis(500)))
use crate::deadline_support::duration_to_deadline;
inline::iter_inline_changes(self, op, duration_to_deadline(Duration::from_millis(500)))
}
/// Iterates over the changes the op expands to with inline emphasis with a deadline.