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

Ported the get_loop_elements wrapper.

Browse Source
This commit is contained in:
Tom Alexander 2020-05-09 14:14:22 -04:00
parent 2712126b3c
commit d758a71fb4
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin.rs
View File

@ -126,7 +126,7 @@ impl Walkable for serde_json::Value {
} }
impl Loopable for serde_json::Value { impl Loopable for serde_json::Value {
fn get_loop_elements(&self) -> Result<Vec<&dyn ContextElement>, RenderError> { fn get_loop_elements(&self) -> Vec<&dyn ContextElement> {
match self { match self {
serde_json::Value::Null => Ok(Vec::new()), serde_json::Value::Null => Ok(Vec::new()),
serde_json::Value::Bool(boolean) => { serde_json::Value::Bool(boolean) => {

2
src/renderer/context_element.rs
View File

@ -23,5 +23,5 @@ pub trait Loopable {
/// once with the context being the element at that path. Finally, /// once with the context being the element at that path. Finally,
/// if its an array-like value then it will render n-times, once /// if its an array-like value then it will render n-times, once
/// for each element of the array. /// for each element of the array.
fn get_loop_elements(&self) -> Result<Vec<&dyn ContextElement>, RenderError>; fn get_loop_elements(&self) -> Vec<&dyn ContextElement>;
} }

12
src/renderer/renderer.rs
View File

@ -197,13 +197,11 @@ impl<'a> DustRenderer<'a> {
/// block, this will return an empty vector. /// block, this will return an empty vector.
fn get_loop_elements<'b>( fn get_loop_elements<'b>(
&'a self, &'a self,
walk_result: Result<&'b dyn ContextElement, RenderError<'b>>, walk_result: Result<&'b dyn ContextElement, WalkError>,
) -> Result<Vec<&'b dyn ContextElement>, RenderError<'b>> { ) -> Vec<&'b dyn ContextElement> {
if let Err(RenderError::NotFound { .. }) = walk_result { match walk_result {
// If reference does not exist in the context, render the else block Err(WalkError::CantWalk) => Vec::new(),
Ok(vec![]) Ok(walk_target) => walk_target.get_loop_elements(),
} else {
Ok(walk_result?.get_loop_elements()?)
} }
} }
} }