Diffstat (limited to 'tests/common/protocol/tag.rs')
| -rw-r--r-- | tests/common/protocol/tag.rs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/common/protocol/tag.rs b/tests/common/protocol/tag.rs index a1811df..cd79a05 100644 --- a/tests/common/protocol/tag.rs +++ b/tests/common/protocol/tag.rs @@ -1,7 +1,8 @@ use effectful::{ bound::{Bool, IsSend, IsSync}, - effective::Effective, - environment::{Environment, NativeForm}, + effective::{Effective, Canonical}, + environment::{Environment}, + blocking::BlockingSpin, forward_send_sync, }; use mockall::mock; @@ -15,15 +16,13 @@ use treaty::{ Flow, Walker, }; -use crate::common::Blocking; - mock! { pub TagVisitor<K: TagKind<E>, E: Environment> { pub fn visit<'a, 'ctx>(&'a mut self, kind: K, walker: DynWalkerObjSafe<'a, 'ctx, E>) -> VisitResult; } } -forward_send_sync!({K: (TagKind<E>)} {} {E: (Environment)} MockTagVisitor<K, E>); +forward_send_sync!({K: (TagKind<E> + Send)} {} {E: (Environment + Send)} MockTagVisitor<K, E>); // any_trait! { // impl['ctx, K][E] MockTagVisitor<K, E> = [ @@ -33,18 +32,18 @@ forward_send_sync!({K: (TagKind<E>)} {} {E: (Environment)} MockTagVisitor<K, E>) // E: Environment, // } -impl<'ctx, K: TagKind<E>, E: Environment> Tag<'ctx, K, E> for MockTagVisitor<K, E> { +impl<'ctx, K: TagKind<E> + Send, E: Environment + Send> Tag<'ctx, K, E> for MockTagVisitor<K, E> { fn visit<'a: 'c, 'b: 'c, 'c>( &'a mut self, kind: K, walker: DynWalkerObjSafe<'b, 'ctx, E>, - ) -> NativeForm<'c, VisitResult, E> { + ) -> Canonical<'c, VisitResult, E> { E::value(self.visit(kind, walker)).cast() } } pub trait TagVisitorExt<'ctx> { - fn visit_tag_and_done<'a, T: ConstTagKind<Blocking>, W: Walker<'ctx, Blocking>>( + fn visit_tag_and_done<'a, T: ConstTagKind<BlockingSpin>, W: Walker<'ctx, BlockingSpin>>( &'a mut self, walker: W, ); @@ -52,14 +51,14 @@ pub trait TagVisitorExt<'ctx> { impl<'ctx, T> TagVisitorExt<'ctx> for T where - T: AsVisitor<'ctx, Blocking>, + T: AsVisitor<'ctx, BlockingSpin>, { - fn visit_tag_and_done<'a, Tag: ConstTagKind<Blocking>, W: Walker<'ctx, Blocking>>( + fn visit_tag_and_done<'a, Tag: ConstTagKind<BlockingSpin>, W: Walker<'ctx, BlockingSpin>>( &'a mut self, walker: W, ) { let result = - visit_tag::<Tag, Blocking, _>(Tag::NEW, self.as_visitor(), walker).into_value(); + visit_tag::<Tag, BlockingSpin, _>(Tag::NEW, self.as_visitor(), walker).wait(); assert_eq!(result.unwrap(), VisitResult::Control(Flow::Done)); } |