bendns' repos / treaty
Diffstat (limited to 'src/protocol/visitor/value.rs')
-rw-r--r--src/protocol/visitor/value.rs51
1 files changed, 19 insertions, 32 deletions
diff --git a/src/protocol/visitor/value.rs b/src/protocol/visitor/value.rs
index ed3a0bd..20c55d9 100644
--- a/src/protocol/visitor/value.rs
+++ b/src/protocol/visitor/value.rs
@@ -6,15 +6,16 @@ use core::ops::ControlFlow;
use crate::{
any::{TypeName, TypeNameable},
+ effect::{any_t, Effect, SyncEffect, Yield},
hkt::hkt,
nameable,
- protocol::{any_t, walker::HintMeta, Effect, SyncEffect, Yield},
+ protocol::walker::HintMeta,
};
/// Trait object for the [`Value`] protocol.
///
/// Types implementing the [`Value`] protocol will implement this trait.
-pub trait Value<'ctx, T, E: Effect<'ctx, ControlFlow<(), ()>>> {
+pub trait Value<'a, 'ctx: 'a, T, E: Effect<'ctx, ControlFlow<(), ()>>> {
/// Visit a value of type `T`.
///
/// Use this to give a value to a visitor. Its expected that a walker
@@ -24,21 +25,19 @@ pub trait Value<'ctx, T, E: Effect<'ctx, ControlFlow<(), ()>>> {
/// If a [`ControlFlow::Break`] is returned then the walker
/// should stop walking as soon as possible as there has likely been
/// and error.
- fn visit<'a>(&'a mut self, value: T) -> Yield<'a, 'ctx, ControlFlow<(), ()>, E>
- where
- 'ctx: 'a;
+ fn visit(&'a mut self, value: T) -> Yield<'a, 'ctx, ControlFlow<(), ()>, E>;
}
nameable! {
pub struct Name['a, 'ctx, T, E];
- impl [T::Name, E] for dyn Value<'ctx, T, E> + 'a where {
+ impl [T::Name, E] for dyn Value<'a, 'ctx, T, E> + 'a where {
T: TypeNameable<'a, 'ctx> + ?Sized,
E: Effect<'ctx, ControlFlow<(), ()>>,
'ctx: 'a,
}
- impl [T, E] where dyn Value<'ctx, T::Nameable, E> + 'a {
+ impl [T, E] where dyn Value<'a, 'ctx, T::Nameable, E> + 'a {
T: TypeName<'a, 'ctx> + ?Sized,
E: Effect<'ctx, ControlFlow<(), ()>>,
'ctx: 'a,
@@ -49,7 +48,7 @@ hkt!((any_t): for<'a, 'ctx> pub KnownHkt => ());
// This enrolls the Value protocol into the walker hint system.
impl<'a, 'ctx: 'a, T, E: Effect<'ctx, ControlFlow<(), ()>>> HintMeta<'ctx>
- for dyn Value<'ctx, T, E> + 'a
+ for dyn Value<'a, 'ctx, T, E> + 'a
{
type Known = KnownHkt<'ctx>;
@@ -74,27 +73,21 @@ mod test {
fn visit() {
struct Visitor(Option<i32>);
- impl<'ctx> Value<'ctx, OwnedStatic<i32>> for Visitor {
- fn visit<'a>(
+ impl<'a, 'ctx: 'a> Value<'a, 'ctx, OwnedStatic<i32>, SyncEffect> for Visitor {
+ fn visit(
&'a mut self,
OwnedStatic(value): OwnedStatic<i32>,
- ) -> core::ops::ControlFlow<()>
- where
- 'ctx: 'a,
- {
+ ) -> core::ops::ControlFlow<()> {
self.0 = Some(value);
ControlFlow::Continue(())
}
}
- impl<'ctx> Value<'ctx, BorrowedStatic<'ctx, i32>> for Visitor {
- fn visit<'a>(
+ impl<'a, 'ctx: 'a> Value<'a, 'ctx, BorrowedStatic<'ctx, i32>, SyncEffect> for Visitor {
+ fn visit(
&'a mut self,
BorrowedStatic(value): BorrowedStatic<'ctx, i32>,
- ) -> core::ops::ControlFlow<()>
- where
- 'ctx: 'a,
- {
+ ) -> core::ops::ControlFlow<()> {
self.0 = Some(*value);
ControlFlow::Continue(())
}
@@ -129,14 +122,11 @@ mod test {
fn visit_borrowed() {
struct Visitor<'ctx>(Option<&'ctx mut String>);
- impl<'ctx> Value<'ctx, BorrowedMutStatic<'ctx, String>> for Visitor<'ctx> {
- fn visit<'a>(
+ impl<'a, 'ctx> Value<'a, 'ctx, BorrowedMutStatic<'ctx, String>, SyncEffect> for Visitor<'ctx> {
+ fn visit(
&'a mut self,
BorrowedMutStatic(value): BorrowedMutStatic<'ctx, String>,
- ) -> ControlFlow<()>
- where
- 'ctx: 'a,
- {
+ ) -> ControlFlow<()> {
self.0 = Some(value);
ControlFlow::Continue(())
}
@@ -165,14 +155,11 @@ mod test {
fn visit_borrowed_unsized() {
struct Visitor<'ctx>(Option<&'ctx str>);
- impl<'ctx> Value<'ctx, BorrowedStatic<'ctx, str>> for Visitor<'ctx> {
- fn visit<'a>(
+ impl<'a, 'ctx: 'a> Value<'a, 'ctx, BorrowedStatic<'ctx, str>, SyncEffect> for Visitor<'ctx> {
+ fn visit(
&'a mut self,
BorrowedStatic(value): BorrowedStatic<'ctx, str>,
- ) -> ControlFlow<()>
- where
- 'ctx: 'a,
- {
+ ) -> ControlFlow<()> {
self.0 = Some(value);
ControlFlow::Continue(())
}