summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2025-08-26 02:23:55 -0400
committerOwen Jacobson <owen@grimoire.ca>2025-08-26 17:42:37 -0400
commita54c548bf00f881f36d2adc3a6a2614b5f72f9ce (patch)
tree4bd7281b65232ed04cf0c2a1c9eff360fa37a409
parent7b131e35fdea1a68aaf9230d157bafb200557ef8 (diff)
Allow callers to pass `Instant`s to `Sequence` predicate constructors.
-rw-r--r--src/conversation/history.rs4
-rw-r--r--src/event/sequence.rs12
2 files changed, 10 insertions, 6 deletions
diff --git a/src/conversation/history.rs b/src/conversation/history.rs
index 746a1b0..8821277 100644
--- a/src/conversation/history.rs
+++ b/src/conversation/history.rs
@@ -30,9 +30,7 @@ impl History {
where
S: Into<Sequence>,
{
- self.events()
- .filter(Sequence::up_to(sequence.into()))
- .collect()
+ self.events().filter(Sequence::up_to(sequence)).collect()
}
// Snapshot of this conversation as of all events recorded in this history.
diff --git a/src/event/sequence.rs b/src/event/sequence.rs
index 77281c2..9a0ea5d 100644
--- a/src/event/sequence.rs
+++ b/src/event/sequence.rs
@@ -50,24 +50,30 @@ impl fmt::Display for Sequence {
}
impl Sequence {
- pub fn up_to<E>(resume_point: Sequence) -> impl for<'e> Fn(&'e E) -> bool
+ pub fn up_to<P, E>(resume_point: P) -> impl for<'e> Fn(&'e E) -> bool + Clone
where
+ P: Into<Self>,
E: Sequenced,
{
+ let resume_point = resume_point.into();
move |event| event.sequence() <= resume_point
}
- pub fn after<E>(resume_point: Sequence) -> impl for<'e> Fn(&'e E) -> bool
+ pub fn after<P, E>(resume_point: P) -> impl for<'e> Fn(&'e E) -> bool + Clone
where
+ P: Into<Self>,
E: Sequenced,
{
+ let resume_point = resume_point.into();
move |event| resume_point < event.sequence()
}
- pub fn start_from<E>(resume_point: Self) -> impl for<'e> Fn(&'e E) -> bool
+ pub fn start_from<P, E>(resume_point: P) -> impl for<'e> Fn(&'e E) -> bool + Clone
where
+ P: Into<Self>,
E: Sequenced,
{
+ let resume_point = resume_point.into();
move |event| resume_point <= event.sequence()
}