bendns' repos / treaty
Diffstat (limited to 'src/protocol/visitor/sequence.rs')
-rw-r--r--src/protocol/visitor/sequence.rs83
1 files changed, 37 insertions, 46 deletions
diff --git a/src/protocol/visitor/sequence.rs b/src/protocol/visitor/sequence.rs
index 340678f..18fcd04 100644
--- a/src/protocol/visitor/sequence.rs
+++ b/src/protocol/visitor/sequence.rs
@@ -4,7 +4,6 @@ use effectful::{
use crate::{
any::type_name,
- hkt::Marker,
protocol::{walker::hint::HintMeta, DynVisitor},
Flow,
};
@@ -15,55 +14,47 @@ use super::VisitResult;
///
/// This protocol uses a scope to give temporary control to the visitor.
/// The visitor will drive the walker for each item.
-pub trait Sequence<'ctx, E: Environment>: DynBind<E> {
- fn visit<'a: 'c, 'b: 'c, 'c>(
- &'a mut self,
- scope: DynSequenceScope<'b, 'ctx, E>,
- ) -> Canonical<'c, VisitResult, E>
- where
- 'ctx: 'a;
+pub trait Sequence<'src, E: Environment>: DynBind<E> {
+ fn visit<'r>(
+ &'r mut self,
+ scope: DynSequenceScope<'r, 'src, E>,
+ ) -> Canonical<'r, VisitResult, E>;
}
-const _: () = {
- pub struct SequenceProto<E: Environment>(Marker<E>);
-
- impl<'a, 'ctx, E> type_name::Lower<'a, 'ctx, &'a &'ctx ()> for SequenceProto<E>
- where
- E: Environment,
- {
- type Lowered = dyn Sequence<'ctx, E> + 'a;
- }
+impl<'u, 'src, E> type_name::Lower<'u, 'src, &'u &'src ()> for dyn Sequence<'static, E>
+where
+ E: Environment,
+{
+ type Lowered = dyn Sequence<'src, E> + 'u;
+}
- impl<'a, 'ctx, E> type_name::Raise<'a, 'ctx, &'a &'ctx ()> for dyn Sequence<'ctx, E> + 'a
- where
- E: Environment,
- {
- type Raised = SequenceProto<E>;
- }
+impl<'u, 'src, E> type_name::Raise<'u, 'src, &'u &'src ()> for dyn Sequence<'src, E> + 'u
+where
+ E: Environment,
+{
+ type Raised = dyn Sequence<'static, E>;
+}
- impl<'a, 'ctx, E: Environment> HintMeta for SequenceProto<E> {
- type Known = Rank1<SequenceKnown>;
+impl<E: Environment> HintMeta for dyn Sequence<'static, E> {
+ type Known = Rank1<SequenceKnown>;
- type Hint = Rank1<SequenceHint>;
- }
+ type Hint = Rank1<SequenceHint>;
+}
- impl<'a, 'ctx, E: Environment> InEnvironment for SequenceProto<E> {
- type Env = E;
- }
-};
+impl<E: Environment> InEnvironment for dyn Sequence<'static, E> {
+ type Env = E;
+}
-pub trait SequenceScope<'ctx, E: Environment>: DynBind<E> {
+pub trait SequenceScope<'src, E: Environment>: DynBind<E> {
fn size_hint(&mut self) -> Canonical<'_, (usize, Option<usize>), E>;
- fn next<'a: 'c, 'lt: 'c, 'b: 'c, 'c>(
- &'a mut self,
- visitor: DynVisitor<'b, 'lt, 'ctx, E>,
- ) -> Canonical<'c, Flow, E>
- where
- 'ctx: 'c + 'a + 'b;
+ fn next<'r>(
+ &'r mut self,
+ visitor: DynVisitor<'r, 'src, E>,
+ ) -> Canonical<'r, Flow, E>;
}
-pub type DynSequenceScope<'a, 'ctx, E> = &'a mut (dyn SequenceScope<'ctx, E> + 'a);
+pub type DynSequenceScope<'r, 'src, E> = &'r mut dyn SequenceScope<'src, E>;
#[derive(Default, SendSync)]
pub struct SequenceKnown {
@@ -76,14 +67,14 @@ pub struct SequenceHint {
}
#[inline(always)]
-pub fn visit_sequence<'a, 'lt, 'ctx, E: Environment>(
- visitor: DynVisitor<'a, 'lt, 'ctx, E>,
- scope: DynSequenceScope<'a, 'ctx, E>,
-) -> Canonical<'a, VisitResult, E> {
+pub fn visit_sequence<'r, 'src, E: Environment>(
+ visitor: DynVisitor<'r, 'src, E>,
+ scope: DynSequenceScope<'r, 'src, E>,
+) -> Canonical<'r, VisitResult, E> {
if let Some(object) = visitor
- .0
- .cast_mut()
- .upcast_mut::<dyn Sequence<'ctx, E> + 'lt>()
+ .into_inner()
+ .as_any_trait_mut()
+ .upcast_mut::<dyn Sequence<'src, E> + 'r>()
{
// Allow the visitor to walk the sequence scope.
object.visit(scope)