Fix filter block #71
Merged
Fix filter block #71
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kijewski
requested changes
Jul 13, 2024
rinja_derive/src/generator.rs
Outdated
| @@ -39,6 39,8 @@ pub(crate) struct Generator<'a> { | |||
| buf_writable: WritableBuffer<'a>, | |||
| // Counter for write! hash named arguments | |||
| named: usize, | |||
| // Used in blocks to check if we are inside a filter block. | |||
| is_in_filter_block: bool, | |||
There was a problem hiding this comment.
You can use is_in_filter_block: u32, and use = 1 and -= 1 so you don't need the prev variable.
rinja_derive/src/generator.rs
Outdated
| @@ -92,6 96,7 @@ impl<'a> Generator<'a> { | |||
| -> {CRATE}::Result<()> {{", | |||
| )); | |||
| buf.writeln(format_args!("use {CRATE}::filters::AutoEscape as _;")); | |||
| buf.writeln(format_args!("use std::fmt::Write;")); | |||
There was a problem hiding this comment.
Please use use ::core::fmt::Write as _;. We already use ::core for everything that is in core. The as _ is useful not to shadow any other Writer name the user want's to use, e.g. std::io::Writer.
GuillaumeGomez
force-pushed
the
fix-filter-block
branch
from
d18e395
to
b753dd6
Compare
|
Fixed the nits. |
Kijewski
approved these changes
Jul 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's the last issue I encountered blocking the docs.rs migration.
So in short: we were writing all "sub instructions" (like
include) inwriteras usual. Except that the filter block is supposed to be applied to anything that was output inside it. To go around this problem, I simpler shadow thewritervariable in a sub-block (the filter block) and then call the filters on it.