bendns' repos / treaty
Diffstat (limited to 'src/protocol/visitor/recoverable.rs')
-rw-r--r--src/protocol/visitor/recoverable.rs73
1 files changed, 34 insertions, 39 deletions
diff --git a/src/protocol/visitor/recoverable.rs b/src/protocol/visitor/recoverable.rs
index f1a597f..cfce540 100644
--- a/src/protocol/visitor/recoverable.rs
+++ b/src/protocol/visitor/recoverable.rs
@@ -1,64 +1,59 @@
use effectful::{
- effective::{Canonical, Effective}, environment::{Environment, InEnvironment}, higher_ranked::Rank1, DynBind, SendSync
+ effective::{Canonical, Effective}, environment::{Environment, InEnvironment}, higher_ranked::Rank1, DynBind
};
use crate::{
any::type_name,
- hkt::Marker,
protocol::{walker::hint::HintMeta, DynVisitor},
Status,
};
use super::VisitResult;
-pub trait Recoverable<'ctx, E: Environment>: DynBind<E> {
- fn visit<'a>(
- &'a mut self,
- scope: DynRecoverableScope<'a, 'ctx, E>,
- ) -> Canonical<'a, VisitResult, E>;
+pub trait Recoverable<'src, E: Environment>: DynBind<E> {
+ fn visit<'r>(
+ &'r mut self,
+ scope: DynRecoverableScope<'r, 'src, E>,
+ ) -> Canonical<'r, VisitResult, E>;
}
-const _: () = {
- pub struct RecoverableProto<E>(Marker<E>);
-
- impl<'a, 'ctx, E: 'static> type_name::Lower<'a, 'ctx, &'a &'ctx ()> for RecoverableProto<E> {
- type Lowered = dyn Recoverable<'ctx, E> + 'a;
- }
+impl<'u, 'src, E: 'static> type_name::Lower<'u, 'src, &'u &'src ()> for dyn Recoverable<'static, E> {
+ type Lowered = dyn Recoverable<'src, E> + 'u;
+}
- impl<'a, 'ctx, E: 'static> type_name::Raise<'a, 'ctx, &'a &'ctx ()>
- for dyn Recoverable<'ctx, E> + 'a
- {
- type Raised = RecoverableProto<E>;
- }
+impl<'u, 'src, E: 'static> type_name::Raise<'u, 'src, &'u &'src ()>
+ for dyn Recoverable<'src, E> + 'u
+{
+ type Raised = dyn Recoverable<'static, E>;
+}
- impl<E: Environment> HintMeta for RecoverableProto<E> {
- type Known = Rank1<()>;
+impl<E: Environment> HintMeta for dyn Recoverable<'static, E> {
+ type Known = Rank1<()>;
- type Hint = Rank1<()>;
- }
+ type Hint = Rank1<()>;
+}
- impl<E: Environment> InEnvironment for RecoverableProto<E> {
- type Env = E;
- }
-};
+impl<E: Environment> InEnvironment for dyn Recoverable<'static, E> {
+ type Env = E;
+}
-pub trait RecoverableScope<'ctx, E: Environment>: DynBind<E> {
- fn new_walk<'this: 'effect, 'visitor: 'effect, 'lt: 'effect, 'effect>(
- &'this mut self,
- visitor: DynVisitor<'visitor, 'lt, 'ctx, E>,
- ) -> Canonical<'effect, Status, E>;
+pub trait RecoverableScope<'src, E: Environment>: DynBind<E> {
+ fn new_walk<'r>(
+ &'r mut self,
+ visitor: DynVisitor<'r, 'src, E>,
+ ) -> Canonical<'r, Status, E>;
}
-pub type DynRecoverableScope<'a, 'ctx, E> = &'a mut (dyn RecoverableScope<'ctx, E> + 'a);
+pub type DynRecoverableScope<'r, 'src, E> = &'r mut dyn RecoverableScope<'src, E>;
-pub fn visit_recoverable<'a, 'lt, 'ctx, E: Environment>(
- visitor: DynVisitor<'a, 'lt, 'ctx, E>,
- scope: DynRecoverableScope<'a, 'ctx, E>,
-) -> Canonical<'a, VisitResult, E> {
+pub fn visit_recoverable<'r, 'src, E: Environment>(
+ visitor: DynVisitor<'r, 'src, E>,
+ scope: DynRecoverableScope<'r, 'src, E>,
+) -> Canonical<'r, VisitResult, E> {
if let Some(object) = visitor
- .0
- .cast_mut()
- .upcast_mut::<dyn Recoverable<'ctx, E> + 'lt>()
+ .into_inner()
+ .as_any_trait_mut()
+ .upcast_mut::<dyn Recoverable<'src, E> + 'r>()
{
// Allow the visitor to give a hint if it wants.
object.visit(scope)