From 89a90eb46c822957af5b6aef8615a7d7398e7de4 Mon Sep 17 00:00:00 2001 From: Anthony Nowell Date: Thu, 5 Oct 2017 21:59:51 -0600 Subject: Make match ref/deref as needed Much of this can be yanked out and made simpler when match-modes lands in stable --- testing/templates/match-literal-num.html | 6 ++++++ testing/tests/matches.rs | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 testing/templates/match-literal-num.html (limited to 'testing') diff --git a/testing/templates/match-literal-num.html b/testing/templates/match-literal-num.html new file mode 100644 index 0000000..4864116 --- /dev/null +++ b/testing/templates/match-literal-num.html @@ -0,0 +1,6 @@ +{% match item %} +{% when 42 %} +Found answer to everything +{% else %} +Else found {{item}} +{% endmatch %} diff --git a/testing/tests/matches.rs b/testing/tests/matches.rs index 4f159ab..b8a6c98 100644 --- a/testing/tests/matches.rs +++ b/testing/tests/matches.rs @@ -9,6 +9,13 @@ struct MatchOptTemplate<'a> { item: Option<&'a str>, } +#[derive(Template)] +#[template(path = "match-opt.html")] +struct MatchOptRefTemplate<'a> { + item: &'a Option<&'a str>, +} + + #[test] fn test_match_option() { let s = MatchOptTemplate { item: Some("foo") }; @@ -21,6 +28,11 @@ fn test_match_option() { assert_eq!(s.render().unwrap(), "\n\nNot Found\n"); } +#[test] +fn test_match_ref_deref() { + let s = MatchOptRefTemplate { item: &Some("foo") }; + assert_eq!(s.render().unwrap(), "\n\nFound literal foo\n"); +} #[derive(Template)] #[template(path = "match-literal.html")] @@ -36,3 +48,18 @@ fn test_match_literal() { let s = MatchLitTemplate { item: "qux" }; assert_eq!(s.render().unwrap(), "\n\nElse found qux\n"); } + +#[derive(Template)] +#[template(path = "match-literal-num.html")] +struct MatchLitNumTemplate { + item: u32, +} + +#[test] +fn test_match_literal_num() { + let s = MatchLitNumTemplate { item: 42 }; + assert_eq!(s.render().unwrap(), "\n\nFound answer to everything\n"); + + let s = MatchLitNumTemplate { item: 23 }; + assert_eq!(s.render().unwrap(), "\n\nElse found 23\n"); +} -- cgit