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

Compiles again.

This commit is contained in:
Tom Alexander 2020-05-09 14:18:45 -04:00
parent d758a71fb4
commit f2f6404017
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
3 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/bin.rs
View File

@ -8,6 +8,7 @@ use renderer::DustRenderer;
use renderer::Loopable;
use renderer::RenderError;
use renderer::Renderable;
use renderer::WalkError;
use renderer::Walkable;
use std::env;
use std::fs;
@ -91,36 +92,17 @@ impl Renderable for serde_json::Value {
}
impl Walkable for serde_json::Value {
fn walk(&self, segment: &str) -> Result<&dyn ContextElement, RenderError> {
fn walk(&self, segment: &str) -> Result<&dyn ContextElement, WalkError> {
match self {
serde_json::Value::Null => Err(RenderError::CantWalk {
segment: segment.to_string(),
elem: self,
}),
serde_json::Value::Bool(_boolean) => Err(RenderError::CantWalk {
segment: segment.to_string(),
elem: self,
}),
serde_json::Value::Number(_num) => Err(RenderError::CantWalk {
segment: segment.to_string(),
elem: self,
}),
serde_json::Value::String(_string) => Err(RenderError::CantWalk {
segment: segment.to_string(),
elem: self,
}),
serde_json::Value::Array(_arr) => Err(RenderError::CantWalk {
segment: segment.to_string(),
elem: self,
}),
serde_json::Value::Object(obj) => {
obj.get(segment)
.map(|val| val as _)
.ok_or(RenderError::CantWalk {
segment: segment.to_string(),
elem: self,
})
}
serde_json::Value::Null => Err(WalkError::CantWalk),
serde_json::Value::Bool(_boolean) => Err(WalkError::CantWalk),
serde_json::Value::Number(_num) => Err(WalkError::CantWalk),
serde_json::Value::String(_string) => Err(WalkError::CantWalk),
serde_json::Value::Array(_arr) => Err(WalkError::CantWalk),
serde_json::Value::Object(obj) => obj
.get(segment)
.map(|val| val as _)
.ok_or(WalkError::CantWalk),
}
}
}
@ -128,30 +110,30 @@ impl Walkable for serde_json::Value {
impl Loopable for serde_json::Value {
fn get_loop_elements(&self) -> Vec<&dyn ContextElement> {
match self {
serde_json::Value::Null => Ok(Vec::new()),
serde_json::Value::Null => Vec::new(),
serde_json::Value::Bool(boolean) => {
if *boolean {
Ok(vec![self])
vec![self]
} else {
Ok(Vec::new())
Vec::new()
}
}
serde_json::Value::Number(_num) => Ok(vec![self]),
serde_json::Value::Number(_num) => vec![self],
serde_json::Value::String(string_value) => {
if string_value.is_empty() {
Ok(Vec::new())
Vec::new()
} else {
Ok(vec![self])
vec![self]
}
}
serde_json::Value::Array(array_value) => {
if array_value.is_empty() {
Ok(Vec::new())
Vec::new()
} else {
Ok(array_value.iter().map(|x| x as _).collect())
array_value.iter().map(|x| x as _).collect()
}
}
serde_json::Value::Object(_obj) => Ok(vec![self]),
serde_json::Value::Object(_obj) => vec![self],
}
}
}

5
src/renderer/parameters_context.rs
View File

@ -39,8 +39,9 @@ impl<'a> Renderable for ParametersContext<'a> {
}
impl<'a> Loopable for ParametersContext<'a> {
fn get_loop_elements(&self) -> Result<Vec<&dyn ContextElement>, RenderError> {
Ok(vec![self])
fn get_loop_elements(&self) -> Vec<&dyn ContextElement> {
// TODO: Would this even ever be called? Won't matter, but I'd like to know.
vec![self]
}
}

8
src/renderer/renderer.rs
View File

@ -104,7 +104,7 @@ impl<'a> DustRenderer<'a> {
match val {
Err(WalkError::CantWalk) => return Ok("".to_owned()),
Ok(final_val) => {
let loop_elements = final_val.get_loop_elements()?;
let loop_elements = final_val.get_loop_elements();
if loop_elements.is_empty() {
return Ok("".to_owned());
} else {
@ -115,7 +115,7 @@ impl<'a> DustRenderer<'a> {
}
DustTag::DTSection(container) => {
let val = walk_path(breadcrumbs, &container.path.keys);
let loop_elements: Vec<&dyn ContextElement> = self.get_loop_elements(val)?;
let loop_elements: Vec<&dyn ContextElement> = self.get_loop_elements(val);
if loop_elements.is_empty() {
// Oddly enough if the value is falsey (like
// an empty array or null), Dust uses the
@ -145,7 +145,7 @@ impl<'a> DustRenderer<'a> {
}
DustTag::DTExists(container) => {
let val = walk_path(breadcrumbs, &container.path.keys);
let loop_elements: Vec<&dyn ContextElement> = self.get_loop_elements(val)?;
let loop_elements: Vec<&dyn ContextElement> = self.get_loop_elements(val);
if loop_elements.is_empty() {
return match &container.else_contents {
Some(body) => self.render_body(&body, breadcrumbs),
@ -160,7 +160,7 @@ impl<'a> DustRenderer<'a> {
}
DustTag::DTNotExists(container) => {
let val = walk_path(breadcrumbs, &container.path.keys);
let loop_elements: Vec<&dyn ContextElement> = self.get_loop_elements(val)?;
let loop_elements: Vec<&dyn ContextElement> = self.get_loop_elements(val);
if !loop_elements.is_empty() {
return match &container.else_contents {
Some(body) => self.render_body(&body, breadcrumbs),