From 8121c93392727c14449099a06fcd7c6142da105f Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Mon, 25 May 2020 14:17:38 -0400 Subject: [PATCH] Make the dust template parser all_consuming. --- src/parser/parser.rs | 2 +- src/renderer/renderer.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/parser/parser.rs b/src/parser/parser.rs index 04204b6..9e70e8c 100644 --- a/src/parser/parser.rs +++ b/src/parser/parser.rs @@ -698,7 +698,7 @@ fn body(i: &str) -> IResult<&str, Body> { pub fn template(i: &str) -> IResult<&str, Template> { // DustJS ignores all preceding whitespace (tabs, newlines, spaces) but only ignores trailing newlines - let (remaining, contents) = delimited(multispace0, body, eof_whitespace)(i)?; + let (remaining, contents) = all_consuming(delimited(multispace0, body, eof_whitespace))(i)?; Ok((remaining, Template { contents: contents })) } diff --git a/src/renderer/renderer.rs b/src/renderer/renderer.rs index 6dce3bb..6a76535 100644 --- a/src/renderer/renderer.rs +++ b/src/renderer/renderer.rs @@ -33,7 +33,6 @@ pub fn compile_template<'a>( source: &'a str, name: String, ) -> Result, CompileError> { - // TODO: Make this all consuming // TODO: This could use better error management let (_remaining, parsed_template) = template(source).expect("Failed to compile template"); Ok(CompiledTemplate {