itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-09-28 21:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions

Browse Source
This commit is contained in:
Guillaume Gomez 2025-05-19 22:50:32 +02:00 committed by René Kijewski
parent c6aa9b2e83
commit 36fd13d3b2
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
askama/src/filters/builtin.rs
View File

@ -473,11 +473,11 @@ impl<S: FastWritable, P: FastWritable> FastWritable for Pluralize<S, P> {
/// "b,c," /// "b,c,"
/// ); /// );
/// ``` /// ```
pub fn reject<T: PartialEq>( pub fn reject<'a, T: PartialEq, U: IntoIterator<Item = T>>(
it: impl IntoIterator<Item = T>, it: U,
filter: T, filter: &'a T,
) -> Result<impl Iterator<Item = T>, Infallible> { ) -> Result<impl Iterator<Item = T> + use<'a, T, U>, Infallible> {
Ok(it.into_iter().filter(move |v| v != &filter)) Ok(it.into_iter().filter(move |v| v != filter))
} }
/// Returns an iterator without filtered out values. /// Returns an iterator without filtered out values.
@ -505,9 +505,9 @@ pub fn reject<T: PartialEq>(
/// ); /// );
/// } /// }
/// ``` /// ```
pub fn reject_with<T: PartialEq, F: Fn(&T) -> bool>( pub fn reject_with<T: PartialEq, F: FnMut(&T) -> bool>(
it: impl IntoIterator<Item = T>, it: impl IntoIterator<Item = T>,
callback: F, mut callback: F,
) -> Result<impl Iterator<Item = T>, Infallible> { ) -> Result<impl Iterator<Item = T>, Infallible> {
Ok(it.into_iter().filter(move |v| !callback(v))) Ok(it.into_iter().filter(move |v| !callback(v)))
} }

5
askama_derive/src/generator/filter.rs
View File

@ -260,9 +260,12 @@ impl<'a> Generator<'a, '_> {
self.visit_arg(ctx, buf, input)?; self.visit_arg(ctx, buf, input)?;
buf.write(','); buf.write(',');
if extra_ampersand { if extra_ampersand {
buf.write('&'); buf.write("&&(");
} }
self.visit_arg(ctx, buf, filter)?; self.visit_arg(ctx, buf, filter)?;
if extra_ampersand {
buf.write(')');
}
buf.write(")?"); buf.write(")?");
Ok(DisplayWrap::Wrapped) Ok(DisplayWrap::Wrapped)
} }