Diffstat (limited to 'src/protocol/visitor/sequence.rs')
| -rw-r--r-- | src/protocol/visitor/sequence.rs | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/protocol/visitor/sequence.rs b/src/protocol/visitor/sequence.rs index 47ea03e..d345ed1 100644 --- a/src/protocol/visitor/sequence.rs +++ b/src/protocol/visitor/sequence.rs @@ -1,35 +1,41 @@ +use core::ops::ControlFlow; + use crate::{ + hkt::hkt, nameable, - protocol::{walker::HintMeta, ControlFlowFor, Effect, SyncEffect, Visitor, any_t}, - hkt::hkt + protocol::{any_t, walker::HintMeta, Yield, Effect, SyncEffect, Visitor}, }; -pub trait Sequence<'ctx, E: Effect<'ctx> = SyncEffect> { +pub trait Sequence<'ctx, E: Effect<'ctx, ControlFlow<(), ()>>> { fn visit<'a>( &'a mut self, scope: &'a mut dyn SequenceScope<'ctx, E>, - ) -> ControlFlowFor<'a, 'ctx, E> where 'ctx: 'a; + ) -> Yield<'a, 'ctx, ControlFlow<(), ()>, E> + where + 'ctx: 'a; } nameable! { pub struct Name['a, 'ctx, E]; impl [E] for dyn Sequence<'ctx, E> + 'a where { - E: Effect<'ctx> + Effect<'ctx, Status>, + E: Effect<'ctx, ControlFlow<(), ()>> + Effect<'ctx, ControlFlow<(), Status>>, 'ctx: 'a } impl [E] where dyn Sequence<'ctx, E> + 'a { - E: Effect<'ctx> + Effect<'ctx, Status>, + E: Effect<'ctx, ControlFlow<(), ()>> + Effect<'ctx, ControlFlow<(), Status>>, 'ctx: 'a } } -pub trait SequenceScope<'ctx, E = SyncEffect> +pub trait SequenceScope<'ctx, E> where - E: Effect<'ctx> + Effect<'ctx, Status>, + E: Effect<'ctx, ControlFlow<(), Status>>, { - fn next<'a>(&'a mut self, visitor: Visitor<'a, 'ctx, E>) -> ControlFlowFor<'a, 'ctx, E, Status> where 'ctx: 'a; + fn next<'a>(&'a mut self, visitor: Visitor<'a, 'ctx, E>) -> Yield<'a, 'ctx, ControlFlow<(), Status>, E> + where + 'ctx: 'a; } #[derive(PartialEq, Eq, PartialOrd, Ord, Copy, Clone, Debug)] @@ -49,8 +55,8 @@ pub struct Hint { pub len: (usize, Option<usize>), } -impl<'a, 'ctx: 'a, E: Effect<'ctx>> HintMeta<'ctx> for dyn Sequence<'ctx, E> + '_ { - type KnownHkt = KnownHkt<'ctx>; +impl<'a, 'ctx: 'a, E: Effect<'ctx, ControlFlow<(), ()>>> HintMeta<'ctx> for dyn Sequence<'ctx, E> + '_ { + type Known = KnownHkt<'ctx>; type Hint = Hint; } |