bendns' repos / treaty
Diffstat (limited to 'tests/common/protocol/hint.rs')
-rw-r--r--tests/common/protocol/hint.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/common/protocol/hint.rs b/tests/common/protocol/hint.rs
index abb38dd..e6e70b3 100644
--- a/tests/common/protocol/hint.rs
+++ b/tests/common/protocol/hint.rs
@@ -1,7 +1,7 @@
use effectful::{
bound::{Bool, IsSend, IsSync},
- effective::Effective,
- environment::{Environment, NativeForm},
+ effective::{Effective, Canonical},
+ environment::{Environment},
forward_send_sync,
higher_ranked::WithLt,
};
@@ -29,9 +29,9 @@ mock! {
}
}
-forward_send_sync!({} {} {P: (?Sized + HintMeta)} MockHintWalker<P>);
+forward_send_sync!({} {} {P: (?Sized + HintMeta + Send)} MockHintWalker<P>);
-impl<'ctx, P: ?Sized + HintMeta> AnyTrait<'ctx> for MockHintWalker<P> {
+impl<'ctx, P: ?Sized + HintMeta + Send> AnyTrait<'ctx> for MockHintWalker<P> {
fn upcast_by_id_mut<'a, 'lt: 'a>(
&'a mut self,
id: WithLtTypeId<'lt, 'ctx>,
@@ -40,10 +40,10 @@ impl<'ctx, P: ?Sized + HintMeta> AnyTrait<'ctx> for MockHintWalker<P> {
'ctx: 'lt,
{
trait_by_id!(&mut self, id, {
- type Impls<'lt, 'ctx> = (dyn Hint<P>);
+ type Impls = (dyn Hint<P>);
+ });
- None
- })
+ None
}
}
@@ -55,12 +55,12 @@ impl<'ctx, P: ?Sized + HintMeta> AnyTrait<'ctx> for MockHintWalker<P> {
// P: HintMeta<Effect = E>,
// }
-impl<'ctx, P: ?Sized + HintMeta> Hint<'ctx, P> for MockHintWalker<P> {
+impl<'ctx, P: ?Sized + HintMeta + Send> Hint<'ctx, P> for MockHintWalker<P> {
fn hint<'this: 'e, 'visitor: 'e, 'hint: 'e, 'e>(
&'this mut self,
visitor: DynVisitorWith<'visitor, 'ctx, P>,
hint: WithLt<'hint, <P as HintMeta>::Hint>,
- ) -> NativeForm<'e, VisitResult, <P>::Env>
+ ) -> Canonical<'e, VisitResult, <P>::Env>
where
'ctx: 'this + 'visitor + 'hint,
{
@@ -70,9 +70,9 @@ impl<'ctx, P: ?Sized + HintMeta> Hint<'ctx, P> for MockHintWalker<P> {
fn known<'a>(
&'a mut self,
hint: &'a WithLt<'a, <P as HintMeta>::Hint>,
- ) -> NativeForm<'a, Result<WithLt<'a, <P as HintMeta>::Known>, ()>, <P>::Env>
+ ) -> Canonical<'a, Result<WithLt<'a, <P as HintMeta>::Known>, ()>, <P>::Env>
where
- WithLt<'a, <P as HintMeta>::Known>: effectful::environment::DynBind<<P>::Env>,
+ WithLt<'a, <P as HintMeta>::Known>: effectful::bound::DynBind<<P>::Env>,
{
todo!()
}
@@ -81,7 +81,7 @@ impl<'ctx, P: ?Sized + HintMeta> Hint<'ctx, P> for MockHintWalker<P> {
// &'this mut self,
// visitor: DynVisitorWith<'visitor, 'ctx, P>,
// hint: WithLt<'hint, P>,
- // ) -> NativeForm<'e, VisitResult, P::Effect>
+ // ) -> Canonical<'e, VisitResult, P::Effect>
// where
// 'ctx: 'this + 'visitor + 'hint + 'e,
// {
@@ -91,7 +91,7 @@ impl<'ctx, P: ?Sized + HintMeta> Hint<'ctx, P> for MockHintWalker<P> {
// fn known<'a>(
// &'a mut self,
// hint: &'a WithLt<'a, P::Hint>,
- // ) -> NativeForm<'a, Result<WithLt<'a, P::Known>, ()>, P::Effect> {
+ // ) -> Canonical<'a, Result<WithLt<'a, P::Known>, ()>, P::Effect> {
// P::Effect::value(Self::known(self)(&(), hint)).cast()
// }
}