From 6297fa01898bddf163887f5a2f492c41a5ba9bd1 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sun, 10 May 2020 22:21:18 -0400 Subject: [PATCH] Rename NewParametersContext to ParametersContext. --- src/renderer/parameters_context.rs | 22 +++++++++++----------- src/renderer/renderer.rs | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/renderer/parameters_context.rs b/src/renderer/parameters_context.rs index b2081d6..3649044 100644 --- a/src/renderer/parameters_context.rs +++ b/src/renderer/parameters_context.rs @@ -48,16 +48,16 @@ impl From<&RValue<'_>> for OwnedRValue { } #[derive(Debug)] -pub struct NewParametersContext { +pub struct ParametersContext { params: HashMap, breadcrumbs: Vec>, } -impl NewParametersContext { +impl ParametersContext { pub fn new( breadcrumbs: &Vec<&dyn ContextElement>, params: &Vec, - ) -> NewParametersContext { + ) -> ParametersContext { let owned_params: HashMap = params .iter() .map(|kvpair| (kvpair.key.to_string(), OwnedRValue::from(&kvpair.value))) @@ -65,16 +65,16 @@ impl NewParametersContext { let owned_breadcrumbs: Vec> = breadcrumbs.iter().map(|ce| ce.clone_to_box()).collect(); - NewParametersContext { + ParametersContext { params: owned_params, breadcrumbs: owned_breadcrumbs, } } } -impl ContextElement for NewParametersContext {} +impl ContextElement for ParametersContext {} -impl Renderable for NewParametersContext { +impl Renderable for ParametersContext { fn render(&self, _filters: &Vec) -> Result { // TODO: Would this even ever be called? Won't matter, but I'd // like to know. Since it is injected 1 above the current @@ -83,7 +83,7 @@ impl Renderable for NewParametersContext { } } -impl Loopable for NewParametersContext { +impl Loopable for ParametersContext { fn get_loop_elements(&self) -> Vec<&dyn ContextElement> { // TODO: Would this even ever be called? Won't matter, but I'd // like to know. Since it is injected 1 above the current @@ -92,7 +92,7 @@ impl Loopable for NewParametersContext { } } -impl Walkable for NewParametersContext { +impl Walkable for ParametersContext { fn walk(&self, segment: &str) -> Result<&dyn ContextElement, WalkError> { let rval = self.params.get(segment).ok_or(WalkError::CantWalk)?; match rval { @@ -102,17 +102,17 @@ impl Walkable for NewParametersContext { } } -impl Clone for NewParametersContext { +impl Clone for ParametersContext { fn clone(&self) -> Self { // TODO: Implement clone - NewParametersContext { + ParametersContext { params: HashMap::new(), breadcrumbs: Vec::new(), } } } -impl CompareContextElement for NewParametersContext { +impl CompareContextElement for ParametersContext { fn equals(&self, other: &dyn ContextElement) -> bool { // TODO: Does this ever happen? perhaps I should have a panic here. false diff --git a/src/renderer/renderer.rs b/src/renderer/renderer.rs index 9f9b49b..c91587b 100644 --- a/src/renderer/renderer.rs +++ b/src/renderer/renderer.rs @@ -12,7 +12,7 @@ use crate::renderer::errors::RenderError; 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::NewParametersContext; +use crate::renderer::parameters_context::ParametersContext; use crate::renderer::walking::walk_path; use std::collections::HashMap; @@ -194,7 +194,7 @@ impl<'a> DustRenderer<'a> { self.render_template(&partial.name, breadcrumbs, Some(blocks))?; return Ok(rendered_content); } else { - let injected_context = NewParametersContext::new(breadcrumbs, &partial.params); + let injected_context = ParametersContext::new(breadcrumbs, &partial.params); let mut new_breadcrumbs = breadcrumbs.clone(); new_breadcrumbs.insert(new_breadcrumbs.len() - 1, &injected_context); let rendered_content =