Diffstat (limited to 'tests/common/protocol/recoverable.rs')
| -rw-r--r-- | tests/common/protocol/recoverable.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/common/protocol/recoverable.rs b/tests/common/protocol/recoverable.rs index f423693..6c55860 100644 --- a/tests/common/protocol/recoverable.rs +++ b/tests/common/protocol/recoverable.rs @@ -1,8 +1,8 @@ use effectful::{ blocking::BlockingSpin, bound::{Bool, IsSend, IsSync}, - effective::{Effective, Canonical}, - environment::{Environment}, + effective::{Canonical, Effective}, + environment::Environment, forward_send_sync, }; use mockall::mock; @@ -44,28 +44,28 @@ impl<'ctx, E: Environment + Send> Recoverable<'ctx, E> for MockRecoverableVisito mock! { pub RecoverableScopeVisitor<E: Environment> { - pub fn new_walk<'a, 'b, 'lt, 'ctx>(&'a mut self, visitor: DynVisitor<'b, 'lt, 'ctx, E>) -> Status; + pub fn new_walk<'r, 'src>(&'r mut self, visitor: DynVisitor<'r, 'src, E>) -> Status; } } forward_send_sync!({} {} {E: (Environment + Send)} MockRecoverableScopeVisitor<E>); impl<'ctx, E: Environment + Send> RecoverableScope<'ctx, E> for MockRecoverableScopeVisitor<E> { - fn new_walk<'a: 'c, 'b: 'c, 'd: 'c, 'c>( - &'a mut self, - visitor: DynVisitor<'b, 'd, 'ctx, E>, - ) -> Canonical<'c, Status, E> { + fn new_walk<'r>(&'r mut self, visitor: DynVisitor<'r, 'ctx, E>) -> Canonical<'r, Status, E> { E::value(self.new_walk(visitor)).cast() } } -pub trait RecoverableVisitorExt<'lt, 'ctx> { - fn visit_recoverable_and_done<'a>(&'a mut self, scope: DynRecoverableScope<'a, 'ctx, BlockingSpin>); +pub trait RecoverableVisitorExt<'ctx> { + fn visit_recoverable_and_done<'a>( + &'a mut self, + scope: DynRecoverableScope<'a, 'ctx, BlockingSpin>, + ); } -impl<'lt, 'ctx, T> RecoverableVisitorExt<'lt, 'ctx> for T +impl<'ctx, T> RecoverableVisitorExt<'ctx> for T where - T: AsVisitor<'lt, 'ctx, BlockingSpin>, + T: AsVisitor<'ctx, BlockingSpin>, { fn visit_recoverable_and_done<'a>( &'a mut self, |