bendns' repos / treaty
Diffstat (limited to 'src/protocol/visitor/value.rs')
-rw-r--r--src/protocol/visitor/value.rs29
1 files changed, 14 insertions, 15 deletions
diff --git a/src/protocol/visitor/value.rs b/src/protocol/visitor/value.rs
index ed8a8ec..d8461f5 100644
--- a/src/protocol/visitor/value.rs
+++ b/src/protocol/visitor/value.rs
@@ -55,7 +55,6 @@ mod test {
AnyTrait,
},
any_trait,
- protocol::SyncControlFlow,
};
use super::*;
@@ -64,7 +63,7 @@ mod test {
fn visit() {
struct Visitor(Option<i32>);
- impl Value<'_, OwnedStatic<i32>, SyncControlFlow> for Visitor {
+ impl Value<'_, OwnedStatic<i32>> for Visitor {
fn visit(
&mut self,
OwnedStatic(value): OwnedStatic<i32>,
@@ -74,7 +73,7 @@ mod test {
}
}
- impl Value<'_, BorrowedStatic<'_, i32>, SyncControlFlow> for Visitor {
+ impl Value<'_, BorrowedStatic<'_, i32>> for Visitor {
fn visit(
&mut self,
BorrowedStatic(value): BorrowedStatic<'_, i32>,
@@ -86,15 +85,15 @@ mod test {
any_trait! {
impl['a, 'ctx] Visitor = [
- dyn Value<'a, OwnedStatic<i32>, SyncControlFlow> + 'a,
- dyn Value<'a, BorrowedStatic<'ctx, i32, SyncControlFlow>> + 'a,
+ dyn Value<'a, OwnedStatic<i32>> + 'a,
+ dyn Value<'a, BorrowedStatic<'ctx, i32>> + 'a,
];
}
let mut v = Visitor(None);
let object: &mut dyn AnyTrait<'_> = &mut v;
object
- .upcast_mut::<dyn Value<'_, OwnedStatic<i32, SyncControlFlow>>>()
+ .upcast_mut::<dyn Value<'_, OwnedStatic<i32>>>()
.unwrap()
.visit(OwnedStatic(42));
@@ -102,7 +101,7 @@ mod test {
let object: &mut dyn AnyTrait<'_> = &mut v;
object
- .upcast_mut::<dyn Value<'_, BorrowedStatic<'_, i32, SyncControlFlow>>>()
+ .upcast_mut::<dyn Value<'_, BorrowedStatic<'_, i32>>>()
.unwrap()
.visit(BorrowedStatic(&101));
@@ -113,9 +112,9 @@ mod test {
fn visit_borrowed() {
struct Visitor<'ctx>(Option<&'ctx mut String>);
- impl<'ctx> Value<BorrowedMutStatic<'ctx, String>> for Visitor<'ctx> {
+ impl<'a, 'ctx> Value<'a, BorrowedMutStatic<'ctx, String>> for Visitor<'ctx> {
fn visit(
- &mut self,
+ &'a mut self,
BorrowedMutStatic(value): BorrowedMutStatic<'ctx, String>,
) -> ControlFlow<()> {
self.0 = Some(value);
@@ -125,7 +124,7 @@ mod test {
any_trait! {
impl['a, 'ctx] Visitor<'ctx> = [
- dyn Value<BorrowedMutStatic<'ctx, String>> + 'a,
+ dyn Value<'a, BorrowedMutStatic<'ctx, String>> + 'a,
];
}
@@ -134,7 +133,7 @@ mod test {
let mut y = String::from("abc");
let object: &mut dyn AnyTrait<'_> = &mut v;
object
- .upcast_mut::<dyn Value<_>>()
+ .upcast_mut::<dyn Value<'_, _>>()
.unwrap()
.visit(BorrowedMutStatic(&mut y));
@@ -146,9 +145,9 @@ mod test {
fn visit_borrowed_unsized() {
struct Visitor<'ctx>(Option<&'ctx str>);
- impl<'ctx> Value<BorrowedStatic<'ctx, str>> for Visitor<'ctx> {
+ impl<'a, 'ctx> Value<'a, BorrowedStatic<'ctx, str>> for Visitor<'ctx> {
fn visit(
- &mut self,
+ &'a mut self,
BorrowedStatic(value): BorrowedStatic<'ctx, str>,
) -> ControlFlow<()> {
self.0 = Some(value);
@@ -158,7 +157,7 @@ mod test {
any_trait! {
impl['a, 'ctx] Visitor<'ctx> = [
- dyn Value<BorrowedStatic<'ctx, str>> + 'a,
+ dyn Value<'a, BorrowedStatic<'ctx, str>> + 'a,
];
}
@@ -167,7 +166,7 @@ mod test {
let y = String::from("abc");
let object: &mut dyn AnyTrait<'_> = &mut v;
object
- .upcast_mut::<dyn Value<BorrowedStatic<'_, str>>>()
+ .upcast_mut::<dyn Value<'_, BorrowedStatic<'_, str>>>()
.unwrap()
.visit(BorrowedStatic(&y));