Diffstat (limited to 'tests/walkers/core/struct.rs')
-rw-r--r--tests/walkers/core/struct.rs32
1 files changed, 23 insertions, 9 deletions
diff --git a/tests/walkers/core/struct.rs b/tests/walkers/core/struct.rs
index 9ea8c31..5ac0926 100644
--- a/tests/walkers/core/struct.rs
+++ b/tests/walkers/core/struct.rs
@@ -1,7 +1,22 @@
use mockall::{predicate::eq, Sequence};
-use treaty::{any::{static_wrapper::{DynOwnedStatic, OwnedStatic}, TypeNameId}, effect::{BlockOn, Blocking, Effect, Future, Spin}, protocol::{visitor::{tag::{DynTag, TagConst}, value::DynValue}, Visitor}, walkers::core::{r#struct::{StructTypeInfo, StructWalker}, value::ValueWalker}, Builder, DefaultMode, Flow, Walker, TAG_STRUCT, TAG_TYPE_NAME};
-
-use crate::common::{builder::MockBuilder, protocol::{tag::MockTagVisitor, visitor::MockValueVisitor}};
+use treaty::{
+ any::{OwnedStatic, TypeNameId},
+ effect::{BlockOn, Blocking, Effect, Future, Spin},
+ protocol::{
+ visitor::{DynTag, DynValue, TagConst},
+ Visitor,
+ },
+ walkers::core::{
+ r#struct::{StructTypeInfo, StructWalker},
+ value::ValueWalker,
+ },
+ Builder, DefaultMode, Flow, Walker, TAG_STRUCT, TAG_TYPE_NAME,
+};
+
+use crate::common::{
+ builder::MockBuilder,
+ protocol::{tag::MockTagVisitor, visitor::MockValueVisitor},
+};
struct Demo {
a: bool,
@@ -69,7 +84,7 @@ fn demo2() {
Flow::Done
);
- Flow::Continue
+ Flow::Continue.into()
});
mock
@@ -83,8 +98,7 @@ fn demo2() {
>()))
.in_sequence(&mut seq)
.return_var(Some(Box::new({
- let mut mock =
- MockTagVisitor::<TagConst<{ TAG_TYPE_NAME.to_int() }>, Blocking>::new();
+ let mut mock = MockTagVisitor::<TagConst<{ TAG_TYPE_NAME.to_int() }>, Blocking>::new();
mock.expect_visit().return_once(|_, walker| {
let mut builder = MockBuilder::<(), (), ()>::new();
@@ -93,11 +107,11 @@ fn demo2() {
.expect_traits_mut()
.once()
.with(eq(TypeNameId::of::<
- DynValue<'static, DynOwnedStatic<&'static str>, Blocking>,
+ DynValue<'static, OwnedStatic<&'static str>, Blocking>,
>()))
.return_var(Some(Box::new({
let mut mock =
- MockValueVisitor::<DynOwnedStatic<&'static str>, Blocking>::new();
+ MockValueVisitor::<OwnedStatic<&'static str>, Blocking>::new();
mock.expect_visit()
.once()
@@ -112,7 +126,7 @@ fn demo2() {
Flow::Done
);
- Flow::Continue
+ Flow::Continue.into()
});
mock