diff options
| author |  Dirkjan Ochtman <dirkjan@ochtman.nl> | 2017-10-22 14:26:38 +0200 |
|---|---|---|
| committer | Dirkjan Ochtman <dirkjan@ochtman.nl> | 2017-10-22 14:26:38 +0200 |
| commit | 14beb21d0cef62ca47ad85617bd9460369a15b61 (patch) | |
| tree | f11fa0f65f0bb212f256ef679e2b9c73c2eb77dd | |
| parent | fef994d2f678a56b08f37043c306cfbf4a93427b (diff) | |
| download | askama-14beb21d0cef62ca47ad85617bd9460369a15b61.tar.gz askama-14beb21d0cef62ca47ad85617bd9460369a15b61.tar.bz2 askama-14beb21d0cef62ca47ad85617bd9460369a15b61.zip | |
Make empty string literals work
| -rw-r--r-- | askama_shared/src/parser.rs | 2 | ||||
| -rw-r--r-- | testing/tests/simple.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/askama_shared/src/parser.rs b/askama_shared/src/parser.rs index eff1779..5bdcb9b 100644 --- a/askama_shared/src/parser.rs +++ b/askama_shared/src/parser.rs @@ -146,7 +146,7 @@ named!(expr_array_lit<Expr>, do_parse!( )); named!(expr_str_lit<Expr>, map!( - delimited!(char!('"'), is_not!("\""), char!('"')), + delimited!(char!('"'), take_until!("\""), char!('"')), |s| Expr::StrLit(str::from_utf8(s).unwrap()) )); diff --git a/testing/tests/simple.rs b/testing/tests/simple.rs index bee5690..37027b7 100644 --- a/testing/tests/simple.rs +++ b/testing/tests/simple.rs @@ -187,11 +187,11 @@ fn test_path_compare() { #[derive(Template)] -#[template(source = "{% for i in [1, 2] %}{{ i }}{% endfor %}", ext = "txt")] +#[template(source = "{% for i in [\"a\", \"\"] %}{{ i }}{% endfor %}", ext = "txt")] struct ArrayTemplate {} #[test] fn test_slice_literal() { let t = ArrayTemplate {}; - assert_eq!(t.render().unwrap(), "12"); + assert_eq!(t.render().unwrap(), "a"); } |