Use ISO 646 alternative operators for bit ops + proper error messages for spaces around the |filter operator
#18
Conversation
testing/tests/whitespace.rs
Outdated
| @@ -39,7 +39,7 @@ fn test_extra_whitespace() { | |||
| let mut template = AllowWhitespaces::default(); | |||
| template.nested_1.nested_2.array = &["a0", "a1", "a2", "a3"]; | |||
| template.nested_1.nested_2.hash.insert("key", "value"); | |||
| assert_eq!(template.render().unwrap(), "\n0\n0\n0\n0\n\n\n\n0\n0\n0\n0\n0\n\na0\na1\nvalue\n\n\n\n\n\n[\n "a0",\n "a1",\n "a2",\n "a3"\n]\n[\n "a0",\n "a1",\n "a2",\n "a3"\n][\n "a0",\n "a1",\n "a2",\n "a3"\n]\n[\n "a1"\n][\n "a1"\n]\n[\n "a1",\n "a2"\n][\n "a1",\n "a2"\n]\n[\n "a1"\n][\n "a1"\n]1-1-1\n3333 3\n2222 2\n0000 0\n3333 3\n\ntruefalse\nfalsefalsefalse\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); | |||
| assert_eq!(template.render().unwrap(), "\n0\n0\n0\n0\n\n\n\n0\n0\n0\n0\n0\n\na0\na1\nvalue\n\n\n\n\n\n[\n "a0",\n "a1",\n "a2",\n "a3"\n]\n[\n "a0",\n "a1",\n "a2",\n "a3"\n][\n "a0",\n "a1",\n "a2",\n "a3"\n]\n[\n "a1"\n][\n "a1"\n]\n[\n "a1",\n "a2"\n][\n "a1",\n "a2"\n]\n[\n "a1"\n][\n "a1"\n]1-1-1\n3333 3\n2222 2\n0000\n3333\n\ntruefalse\nfalsefalsefalse\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); | |||
There was a problem hiding this comment.
The diff here is worrying.
There was a problem hiding this comment.
Yeah, I changed the amount of tests in https://github.com/rinja-rs/rinja/pull/18/files#diff-32df128cd4727b02c717b5945bc12d3fb10a618ce4f7dc034e507fb91409cc7eL37-L38. I'll re-add another test to both lines in the template, so the asserted text does not change.
I don't quite like this kind of testing anyway, because it can't be debugged. Either the data is the same or not. It's a blackbox.
There was a problem hiding this comment.
Agreed but it's quite important sadly. It was very useful for me when debugging block filters. If you have a better idea to compare outputs, I'm very interested. :)
| @@ -35,7 +35,7 @@ | |||
| {{1+2}}{{ 1+2 }}{{ 1 +2 }}{{ 1+ 2 }} {{ 1 + 2 }} | |||
| {{1*2}}{{ 1*2 }}{{ 1 *2 }}{{ 1* 2 }} {{ 1 * 2 }} | |||
| {{1&2}}{{ 1&2 }}{{ 1 &2 }}{{ 1& 2 }} {{ 1 & 2 }} | |||
| {{1|2}}{{ 1|2 }}{{ 1 |2 }}{{ 1| 2 }} {{ 1 | 2 }} | |||
| {{1 bitor 2}}{{ 1 bitor 2 }}{{ 1 bitor 2}}{{1 bitor 2 }} {{1 bitor 2}} | |||
There was a problem hiding this comment.
Why this weird tab change? Wouldn't adding whitespace characters before 1 and after 2 provide the expected result?
There was a problem hiding this comment.
I had no idea what to do in the last test. :) If I remove it, testing/tests/whitespace.rs:42 changes.
There was a problem hiding this comment.
Oh well, let's keep it as is for now, I'll try to take a look later on.
Kijewski
force-pushed
the
pr-iso646
branch
3 times, most recently
from
7efe77e
to
6d704c3
Compare
rinja_parser/src/lib.rs
Outdated
| ))(j) | ||
| } else { | ||
| Err(nom::Err::Failure(ErrorContext::new( | ||
| "The filter operator `|` must not be preceeded by any whitespace characters.\n\ |
There was a problem hiding this comment.
Little nit: other error messages don't start with a capital letter.
There was a problem hiding this comment.
I was not sure about that, because it's two sentences. Maybe I should join them with a ";", so an initial lower cases character makes more sense? :D
| @@ -0,0 +1,46 @@ | |||
| use rinja::Template; | |||
There was a problem hiding this comment.
Thanks for adding the ui tests for error output!
There was a problem hiding this comment.
I love UI tests, and I love that it's so simple to do them in rust. In most languages you only test the "good" outcomes, but the bad outcomes are just as important.
|
So remains nitpicking and the docs. Do you me want to handle the cherry-picking? |
Yes, I'd be thankful if you do it. |
Kijewski
changed the title
|filter operator
|
Say no more, I'm on it! |
This change allows simplifying the use of filter expressions, because you won't have to care about spaces around the `|` pipe operator.
|
Looks good to me, thanks! |
This change allows simplifying the use of filter expressions, because you won't have to care about spaces around the
|pipe operator.Todo:
Resolves #16.