talexander/duster
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge Cant and Wont Walk.

Browse Source
This commit is contained in:
Tom Alexander
2020-05-09 13:51:02 -04:00
parent 2108f5cace
commit 7d63d6ef7b
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/renderer/renderer.rs
View File

@@ -226,9 +226,7 @@ fn walk_path_from_single_level<'a>(
let mut output = context;
for elem in path.iter() {
let new_val = output.walk(elem);
if let Err(RenderError::WontWalk { .. }) = new_val {
return Ok(walk_failure);
} else if let Err(RenderError::CantWalk { .. }) = new_val {
if let Err(RenderError::CantWalk { .. }) = new_val {
return Ok(walk_failure);
}
walk_failure = WalkResult::PartialWalk;
@@ -298,7 +296,7 @@ mod tests {
impl<I: ContextElement> Walkable for HashMap<&str, I> {
fn walk(&self, segment: &str) -> Result<&dyn ContextElement, RenderError> {
let child = self.get(segment).ok_or(RenderError::WontWalk {
let child = self.get(segment).ok_or(RenderError::CantWalk {
segment: segment.to_string(),
elem: self,
})?;