From 46fe1f52041a4318ec7590379c37346a570115e9 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 24 May 2020 15:01:41 -0400
Subject: [PATCH] Fix the last case by changing the lifetimes and delete the
 old fractured implementation.

---
 src/renderer/renderer.rs |   5 +-
 src/renderer/walking.rs  | 106 ---------------------------------------
 2 files changed, 2 insertions(+), 109 deletions(-)

diff --git a/src/renderer/renderer.rs b/src/renderer/renderer.rs
index d4b77e2..d1d3a20 100644
--- a/src/renderer/renderer.rs
+++ b/src/renderer/renderer.rs
@@ -14,7 +14,6 @@ use crate::renderer::errors::WalkError;
 use crate::renderer::inline_partial_tree::extract_inline_partials;
 use crate::renderer::inline_partial_tree::InlinePartialTreeElement;
 use crate::renderer::parameters_context::ParametersContext;
-use crate::renderer::walking::walk_path;
 use crate::renderer::walking::walk_path_combined;
 use std::collections::HashMap;
 
@@ -490,7 +489,7 @@ impl<'a> DustRenderer<'a> {
     }
 
     fn get_rval<'b>(
-        breadcrumbs: &Vec<&'b dyn ContextElement>,
+        breadcrumbs: &'b Vec<&'b dyn ContextElement>,
         param_map: &HashMap<&str, &'b RValue<'b>>,
         key: &str,
     ) -> Option<Result<&'b dyn ContextElement, WalkError>> {
@@ -498,7 +497,7 @@ impl<'a> DustRenderer<'a> {
             None => None,
             Some(rval) => match rval {
                 RValue::RVLiteral(literal) => Some(Ok(literal)),
-                RValue::RVPath(path) => Some(walk_path(breadcrumbs, &path.keys)),
+                RValue::RVPath(path) => Some(walk_path_combined(breadcrumbs, &path.keys)),
             },
         }
     }
diff --git a/src/renderer/walking.rs b/src/renderer/walking.rs
index 8d0b2f7..ae24dde 100644
--- a/src/renderer/walking.rs
+++ b/src/renderer/walking.rs
@@ -8,31 +8,6 @@ enum WalkResult<'a> {
     FullyWalked(&'a dyn ContextElement),
 }
 
-fn walk_path_from_single_level<'a>(
-    context: &'a dyn ContextElement,
-    path: &[&str],
-) -> WalkResult<'a> {
-    if path.is_empty() {
-        return WalkResult::FullyWalked(context);
-    }
-
-    let mut walk_failure = WalkResult::NoWalk;
-    let mut output = context;
-    for elem in path.iter() {
-        match output.walk(elem) {
-            Err(WalkError::CantWalk { .. }) => {
-                return walk_failure;
-            }
-            Ok(new_val) => {
-                walk_failure = WalkResult::PartialWalk;
-                output = new_val;
-            }
-        }
-    }
-
-    WalkResult::FullyWalked(output)
-}
-
 fn walk_path_from_single_level_borrow<'a, P, C>(context: &'a C, path: &[P]) -> WalkResult<'a>
 where
     P: Borrow<str>,
@@ -106,84 +81,3 @@ where
     }
     Err(WalkError::CantWalk)
 }
-
-pub fn walk_path<'a>(
-    breadcrumbs: &Vec<&'a dyn ContextElement>,
-    path: &'a Vec<&str>,
-) -> Result<&'a dyn ContextElement, WalkError> {
-    if path.is_empty() {
-        return Ok(*breadcrumbs
-            .last()
-            .expect("Breadcrumbs should never be empty"));
-    }
-    if *path.first().expect("Already proved path is not empty") == "." {
-        return match walk_path_from_single_level(
-            *breadcrumbs
-                .last()
-                .expect("Breadcrumbs should never be empty"),
-            &path[1..],
-        ) {
-            // If no walking was done at all or we partially walked
-            // then stop trying to find anything because '.' restricts
-            // us to the current scope
-            WalkResult::NoWalk | WalkResult::PartialWalk => Err(WalkError::CantWalk),
-            WalkResult::FullyWalked(new_context) => Ok(new_context),
-        };
-    }
-    for context in breadcrumbs.iter().rev() {
-        match walk_path_from_single_level(*context, path) {
-            // If no walking was done at all, keep looping
-            WalkResult::NoWalk => {}
-            // If we partially walked then stop trying to find
-            // anything
-            WalkResult::PartialWalk => {
-                return Err(WalkError::CantWalk);
-            }
-            WalkResult::FullyWalked(new_context) => return Ok(new_context),
-        }
-    }
-    Err(WalkError::CantWalk)
-}
-
-pub fn owned_walk_path<'a>(
-    breadcrumbs: &'a Vec<Box<dyn ContextElement>>,
-    path: &Vec<String>,
-) -> Result<&'a dyn ContextElement, WalkError> {
-    if path.is_empty() {
-        return Ok(breadcrumbs
-            .last()
-            .expect("Breadcrumbs should never be empty")
-            .as_ref());
-    }
-
-    let path_reference: Vec<&str> = path.iter().map(|p| &p[..]).collect();
-    if path.first().expect("Already proved path is not empty") == "." {
-        return match walk_path_from_single_level(
-            breadcrumbs
-                .last()
-                .expect("Breadcrumbs should never be empty")
-                .as_ref(),
-            &path_reference[1..],
-        ) {
-            // If no walking was done at all or we partially walked
-            // then stop trying to find anything because '.' restricts
-            // us to the current scope
-            WalkResult::NoWalk | WalkResult::PartialWalk => Err(WalkError::CantWalk),
-            WalkResult::FullyWalked(new_context) => Ok(new_context),
-        };
-    }
-
-    for context in breadcrumbs.iter().rev() {
-        match walk_path_from_single_level(context.as_ref(), &path_reference) {
-            // If no walking was done at all, keep looping
-            WalkResult::NoWalk => {}
-            // If we partially walked then stop trying to find
-            // anything
-            WalkResult::PartialWalk => {
-                return Err(WalkError::CantWalk);
-            }
-            WalkResult::FullyWalked(new_context) => return Ok(new_context),
-        }
-    }
-    Err(WalkError::CantWalk)
-}