diff --git a/src/grammar.rs b/src/grammar.rs index f58909984..187972c06 100644 --- a/src/grammar.rs +++ b/src/grammar.rs @@ -261,7 +261,7 @@ mod test { "{{#if}}hello{{else~}}world{{/if}}", "{{#if}}hello{{~^~}}world{{/if}}", "{{#if}}{{/if}}", - "{{#if}}hello{{else if}}world{{else}}test{{/if}}" + "{{#if}}hello{{else if}}world{{else}}test{{/if}}", ]; for i in s.iter() { assert_rule!(Rule::helper_block, i); diff --git a/src/helpers/helper_if.rs b/src/helpers/helper_if.rs index 554db45a3..58662cce6 100644 --- a/src/helpers/helper_if.rs +++ b/src/helpers/helper_if.rs @@ -115,7 +115,10 @@ mod test { assert_eq!( "3".to_owned(), handlebars - .render_template("{{#if a}}1{{else if b}}2{{else if c}}3{{else if d}}4{{else}}0{{/if}}", &json!({"c": 1, "d":1})) + .render_template( + "{{#if a}}1{{else if b}}2{{else if c}}3{{else if d}}4{{else}}0{{/if}}", + &json!({"c": 1, "d":1}) + ) .unwrap() ); } @@ -127,7 +130,10 @@ mod test { assert_eq!( "4".to_owned(), handlebars - .render_template("{{#if a}}1{{else if b}}2{{else if c}}3{{else if d}}4{{/if}}", &json!({"d":1})) + .render_template( + "{{#if a}}1{{else if b}}2{{else if c}}3{{else if d}}4{{/if}}", + &json!({"d":1}) + ) .unwrap() ); } diff --git a/src/render.rs b/src/render.rs index ba5c2cb89..1422654d3 100644 --- a/src/render.rs +++ b/src/render.rs @@ -666,7 +666,13 @@ impl Parameter { } impl Renderable for HelperTemplate { - fn render<'reg: 'rc, 'rc>(&'rc self, registry: &'reg Registry<'reg>, ctx: &'rc Context, rc: &mut RenderContext<'reg, 'rc>, out: &mut dyn Output) -> Result<(), RenderError> { + fn render<'reg: 'rc, 'rc>( + &'rc self, + registry: &'reg Registry<'reg>, + ctx: &'rc Context, + rc: &mut RenderContext<'reg, 'rc>, + out: &mut dyn Output, + ) -> Result<(), RenderError> { render_helper(self, registry, ctx, rc, out) } } diff --git a/src/template.rs b/src/template.rs index eb500f2b1..15f70c8db 100644 --- a/src/template.rs +++ b/src/template.rs @@ -149,7 +149,7 @@ impl HelperTemplate { block, template: None, inverse: None, - chain: false + chain: false, } } @@ -162,7 +162,7 @@ impl HelperTemplate { block, template: None, inverse: None, - chain: true + chain: true, } } @@ -176,7 +176,7 @@ impl HelperTemplate { template: None, inverse: None, block: false, - chain: false + chain: false, } } @@ -184,8 +184,7 @@ impl HelperTemplate { !self.block && self.params.is_empty() && self.hash.is_empty() } - fn insert_inverse_node(&mut self, mut node: Box) - { + fn insert_inverse_node(&mut self, mut node: Box) { // Create a list in "inverse" member to hold the else-chain. // Here we create the new template to save the else-chain node. // The template render could render it successfully without any code add. @@ -193,12 +192,9 @@ impl HelperTemplate { node.inverse = self.inverse.take(); new_chain_template.elements.push(HelperBlock(node)); self.inverse = Some(new_chain_template); - } - - fn ref_chain_head_mut(&mut self) -> Option<&mut Box> - { + fn ref_chain_head_mut(&mut self) -> Option<&mut Box> { if self.chain { if let Some(inverse_tmpl) = &mut self.inverse { assert_eq!(inverse_tmpl.elements.len(), 1); @@ -210,30 +206,24 @@ impl HelperTemplate { None } - fn set_chain_template(&mut self, tmpl: Option