itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-09-29 05:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge handling of trailing newline into get_template_source()

Browse Source
This commit is contained in:
Dirkjan Ochtman 2017-08-06 14:51:56 +02:00
parent 05f11a6843
commit b9cb5b82e6
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
askama_derive/src/lib.rs
View File

@ -66,10 +66,7 @@ fn get_template_meta(ast: &syn::DeriveInput) -> TemplateMeta {
/// value as passed to the `template()` attribute.
fn build_template(ast: &syn::DeriveInput) -> String {
let meta = get_template_meta(ast);
let mut src = path::get_template_source(&meta.path);
if src.ends_with('\n') {
let _ = src.pop();
}
let src = path::get_template_source(&meta.path);
let nodes = parser::parse(&src);
if meta.print == "ast" || meta.print == "all" {
println!("{:?}", nodes);

14
askama_derive/src/parser.rs
View File

@ -323,16 +323,10 @@ named!(block_include<Node>, 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<Node>, do_parse!(

5
askama_derive/src/path.rs
View File

@ -46,6 +46,9 @@ pub fn get_template_source(tpl_file: &str) -> String {
};
let mut s = String::new();
f.read_to_string(&mut s).unwrap();
if s.ends_with('\n') {
let _ = s.pop();
}
s
}
@ -56,7 +59,7 @@ mod tests {
#[test]
fn get_source() {
assert_eq!(get_template_source("sub/b.html"), "bar\n");
assert_eq!(get_template_source("sub/b.html"), "bar");
}
#[test]