diff options
| -rw-r--r-- | src/conversation/history.rs | 4 | ||||
| -rw-r--r-- | src/event/sequence.rs | 12 |
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() } |