bendns' repos / treaty
Diffstat (limited to 'src/protocol/visitor/sequence.rs')
-rw-r--r--src/protocol/visitor/sequence.rs34
1 files changed, 18 insertions, 16 deletions
diff --git a/src/protocol/visitor/sequence.rs b/src/protocol/visitor/sequence.rs
index 44a80c6..d1b16d9 100644
--- a/src/protocol/visitor/sequence.rs
+++ b/src/protocol/visitor/sequence.rs
@@ -3,26 +3,32 @@ use crate::{
protocol::{walker::HintMeta, ControlFlowFor, Effect, SyncEffect, Visitor},
};
-pub trait Sequence<'ctx, E: Effect = SyncEffect> {
- fn visit<'a>(&'a mut self, scope: &'a mut dyn SequenceScope<'ctx, E>) -> ControlFlowFor<'a, E>;
+pub trait Sequence<'a, 'ctx: 'a, E: Effect<'ctx> = SyncEffect> {
+ fn visit(
+ &'a mut self,
+ scope: &'a mut dyn for<'b> SequenceScope<'b, 'ctx, E>,
+ ) -> ControlFlowFor<'a, 'ctx, E>;
}
nameable! {
- pub struct Name['a, 'ctx, E];
+ pub struct Name['a, 'ctx: 'a, E];
- impl [E] for dyn Sequence<'ctx, E> + 'a where {
- E: Effect + 'static,
+ impl [E] for dyn Sequence<'a, 'ctx, E> + 'a where {
+ E: Effect<'ctx>,
'ctx: 'a
}
- impl [E] where dyn Sequence<'ctx, E> + 'a {
- E: Effect + 'static,
+ impl [E] where dyn Sequence<'a, 'ctx, E> + 'a {
+ E: Effect<'ctx>,
'ctx: 'a
}
}
-pub trait SequenceScope<'ctx, E: Effect = SyncEffect> {
- fn next<'a>(&'a mut self, visitor: &'a mut Visitor<'a, 'ctx>) -> ControlFlowFor<'a, E, Status>;
+pub trait SequenceScope<'a, 'ctx: 'a, E = SyncEffect>
+where
+ E: Effect<'ctx> + Effect<'ctx, Status>,
+{
+ fn next(&'a mut self, visitor: Visitor<'a, 'ctx, E>) -> ControlFlowFor<'a, 'ctx, E, Status>;
}
#[derive(PartialEq, Eq, PartialOrd, Ord, Copy, Clone, Debug)]
@@ -40,12 +46,8 @@ pub struct Hint {
pub len: (usize, Option<usize>),
}
-impl<'ctx, E: Effect> HintMeta<'ctx> for dyn Sequence<'ctx, E> + '_ {
- type Known<'a> = Known
- where
- 'ctx: 'a;
+impl<'a, 'ctx: 'a, E: Effect<'ctx>> HintMeta<'a, 'ctx> for dyn Sequence<'a, 'ctx, E> + '_ {
+ type Known = Known;
- type Hint<'a> = Hint
- where
- 'ctx: 'a;
+ type Hint = Hint;
}