aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar yossyJ <28825627+yossyJ@users.noreply.github.com>2019-01-08 23:57:45 +0900
committerLibravatar Dirkjan Ochtman <dirkjan@ochtman.nl>2019-01-08 15:57:45 +0100
commitc5c37f56a1232ff924a6bfda6c1c05e64a6241b1 (patch)
tree01a8218aa66c8ac8f1572c27f0d7c2a687e25060
parent99596c41f8b6f09b67427ba15e40a7fe3130e459 (diff)
downloadaskama-c5c37f56a1232ff924a6bfda6c1c05e64a6241b1.tar.gz
askama-c5c37f56a1232ff924a6bfda6c1c05e64a6241b1.tar.bz2
askama-c5c37f56a1232ff924a6bfda6c1c05e64a6241b1.zip
Allow trailing commas in tuples (#188)
Diffstat (limited to '')
-rw-r--r--askama_derive/src/parser.rs1
-rw-r--r--testing/templates/for.html2
2 files changed, 2 insertions, 1 deletions
diff --git a/askama_derive/src/parser.rs b/askama_derive/src/parser.rs
index 27a9ed0..c4cb52d 100644
--- a/askama_derive/src/parser.rs
+++ b/askama_derive/src/parser.rs
@@ -296,6 +296,7 @@ named!(target_tuple<Input, Target>, do_parse!(
res
})
)) >>
+ opt!(ws!(tag!(","))) >>
tag!(")") >>
(Target::Tuple(args.unwrap_or_default()))
));
diff --git a/testing/templates/for.html b/testing/templates/for.html
index f749752..3d4533b 100644
--- a/testing/templates/for.html
+++ b/testing/templates/for.html
@@ -1,6 +1,6 @@
{% for s in strings %}
{{- loop.index0 }}. {{ s }}{% if loop.first %} (first){% endif %}
{% endfor %}
-{% for (s1, s2) in tuple_strings %}
+{% for (s1, s2, ) in tuple_strings %}
{{- loop.index0 }}. {{ s1 }},{{ s2 }}{% if loop.first %} (first){% endif %}
{% endfor %}