bendns' repos / treaty
Diffstat (limited to 'src/walk/walkers/core/value.rs')
-rw-r--r--src/walk/walkers/core/value.rs41
1 files changed, 25 insertions, 16 deletions
diff --git a/src/walk/walkers/core/value.rs b/src/walk/walkers/core/value.rs
index 5ed43e0..d3f9159 100644
--- a/src/walk/walkers/core/value.rs
+++ b/src/walk/walkers/core/value.rs
@@ -1,4 +1,9 @@
-use effectful::{bound::IsSync, environment::{DynBind, Environment, NativeForm}, forward_send_sync};
+use effectful::{
+ bound::IsSync,
+ effective::Effective,
+ environment::{DynBind, Environment, NativeForm},
+ forward_send_sync,
+};
use crate::{
any::{BorrowedStatic, OwnedStatic, TempBorrowedStatic},
@@ -40,9 +45,9 @@ impl<T: Copy> From<&T> for ValueWalker<T> {
}
}
-impl<'ctx, T: 'static, E: Environment> crate::Walker<'ctx, E> for ValueWalker<T>
+impl<'ctx, T: 'static, E: Environment> crate::Walker<'ctx, E> for ValueWalker<T>
where
- T: DynBind<E>
+ T: DynBind<E>,
{
type Error = Never;
@@ -54,7 +59,9 @@ where
visitor: DynVisitor<'b, 'ctx, E>,
) -> NativeForm<'c, Result<Self::Output, Self::Error>, E> {
// Attempt to visit using the value protocol.
- visit_value::<_, E>(visitor, OwnedStatic(self.0)).map(|_| Ok(()))
+ visit_value::<_, E>(visitor, OwnedStatic(self.0))
+ .map((), |_, _| Ok(()))
+ .cast()
}
}
@@ -76,7 +83,7 @@ impl<'ctx, T: ?Sized> BorrowWalker<'ctx, T> {
impl<'ctx, T: ?Sized + DynBind<E> + 'static, E: Environment> crate::Walker<'ctx, E>
for BorrowWalker<'ctx, T>
where
- T: IsSync<E::NeedSend>
+ T: IsSync<E::NeedSend>,
{
type Error = Never;
@@ -88,16 +95,18 @@ where
visitor: DynVisitor<'b, 'ctx, E>,
) -> NativeForm<'c, Result<Self::Output, Self::Error>, E> {
// Attempt to visit using the value protocol.
- E::as_ctx((self, visitor), |(this, visitor)| {
- visit_value::<_, E>(visitor.cast(), BorrowedStatic(this.0))
- .map(VisitResult::unit_skipped)
- .cast()
- })
- .if_skipped(|(this, visitor)| {
- visit_value::<_, E>(visitor.cast(), TempBorrowedStatic(this.0))
- .map(VisitResult::unit_skipped)
- .cast()
- })
- .map(|((this, _), _)| Ok(this.0))
+ E::value((self, visitor))
+ .update((), |_, (this, visitor)| {
+ visit_value::<_, E>(visitor.cast(), BorrowedStatic(this.0))
+ .map((), |_, x| VisitResult::unit_skipped(x))
+ .cast()
+ })
+ .if_skipped((), |_, (this, visitor)| {
+ visit_value::<_, E>(visitor.cast(), TempBorrowedStatic(this.0))
+ .map((), |_, x| VisitResult::unit_skipped(x))
+ .cast()
+ })
+ .map((), |_, ((this, _), _)| Ok(this.0))
+ .cast()
}
}