bendns' repos / treaty
Diffstat (limited to 'src/walk/walkers/core/key_value.rs')
-rw-r--r--src/walk/walkers/core/key_value.rs25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/walk/walkers/core/key_value.rs b/src/walk/walkers/core/key_value.rs
index 36f2281..85a15a3 100644
--- a/src/walk/walkers/core/key_value.rs
+++ b/src/walk/walkers/core/key_value.rs
@@ -2,10 +2,7 @@ use crate::{
effect::{Effect, Future},
never::Never,
protocol::{
- visitor::{
- tag::{visit_tag, TagConst, TagError, TagKind},
- Status,
- },
+ visitor::{visit_tag, TagConst, TagError, TagKind, VisitResult},
Visitor,
},
walkers::core::noop::NoopWalker,
@@ -65,7 +62,7 @@ where
{
E::wrap(async move {
match visit_tag::<T, E, _>(self.tag, visitor, NoopWalker::new()).await {
- Ok(Status::Skipped(_)) => {
+ Ok(VisitResult::Skipped(_)) => {
match visit_tag::<TagConst<{ TAG_KEY_VALUE.to_int() }>, E, _>(
TagConst,
visitor,
@@ -73,13 +70,13 @@ where
)
.await
{
- Ok(Status::Skipped(_) | Status::Flow(Flow::Continue)) => {}
- Ok(Status::Flow(_flow)) => return Ok(()),
+ Ok(VisitResult::Skipped(_) | VisitResult::Control(Flow::Continue)) => {}
+ Ok(VisitResult::Control(_flow)) => return Ok(()),
Err(_) => todo!(),
}
}
- Ok(Status::Flow(Flow::Continue)) => {}
- Ok(Status::Flow(_flow)) => todo!(),
+ Ok(VisitResult::Control(Flow::Continue)) => {}
+ Ok(VisitResult::Control(_flow)) => todo!(),
Err(_) => todo!(),
}
@@ -90,8 +87,8 @@ where
)
.await
{
- Ok(Status::Skipped(_) | Status::Flow(Flow::Continue)) => {}
- Ok(Status::Flow(_flow)) => return Ok(()),
+ Ok(VisitResult::Skipped(_) | VisitResult::Control(Flow::Continue)) => {}
+ Ok(VisitResult::Control(_flow)) => return Ok(()),
Err(_) => todo!(),
}
@@ -102,15 +99,15 @@ where
)
.await
{
- Ok(Status::Flow(Flow::Continue)) => {}
- Ok(Status::Skipped(value_walker)) => {
+ Ok(VisitResult::Control(Flow::Continue)) => {}
+ Ok(VisitResult::Skipped(value_walker)) => {
// Fallback to just walking the value.
match value_walker.walk(visitor).await {
Ok(_) => {}
Err(_err) => todo!(),
}
}
- Ok(Status::Flow(_flow)) => todo!(),
+ Ok(VisitResult::Control(_flow)) => todo!(),
Err(_) => todo!(),
}