From b9cb5b82e6c87bf0f6037d097476d69f5241bf3a Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Sun, 6 Aug 2017 14:51:56 +0200 Subject: Merge handling of trailing newline into get_template_source() --- askama_derive/src/parser.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'askama_derive/src/parser.rs') diff --git a/askama_derive/src/parser.rs b/askama_derive/src/parser.rs index d466379..ad23cce 100644 --- a/askama_derive/src/parser.rs +++ b/askama_derive/src/parser.rs @@ -323,16 +323,10 @@ named!(block_include, do_parse!( ws!(tag_s!("include")) >> name: ws!(expr_str_lit) >> nws: opt!(tag_s!("-")) >> - ({ - let mut src = match name { - Expr::StrLit(s) => path::get_template_source(s), - _ => panic!("include path must be a string literal"), - }; - if src.ends_with('\n') { - let _ = src.pop(); - } - Node::Include(WS(pws.is_some(), nws.is_some()), src) - }) + (Node::Include(WS(pws.is_some(), nws.is_some()), match name { + Expr::StrLit(s) => path::get_template_source(s), + _ => panic!("include path must be a string literal"), + })) )); named!(block_node, do_parse!( -- cgit