Adapt to minijinja 2.21, bump minijinja-contrib in lockstep

The 2.21 AST grew a dedicated Compare node for chained comparisons,
which the i18n scanner needs to walk. Also raise the workspace
requirements from 2.15.1/2.12.0 to 2.21.0.
This commit is contained in:
Quentin Gliech
2026-07-03 17:09:37 +02:00
parent fa9f6266bf
commit cb46044f0d
3 changed files with 11 additions and 4 deletions
Generated
+2 -2
View File
@@ -3941,9 +3941,9 @@ dependencies = [
[[package]]
name = "minijinja-contrib"
version = "2.12.0"
version = "2.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "182ba1438db4679ddfa03792c183bdc2b9ce26b58e7d41a749e59b06497cf136"
checksum = "85342f6fac0be8ccd5bd00d9066be538f34f393f577b75d81b17c8398a6b43bb"
dependencies = [
"minijinja",
"serde",
+2 -2
View File
@@ -383,12 +383,12 @@ version = "0.3.17"
# Templates
[workspace.dependencies.minijinja]
version = "2.15.1"
version = "2.21.0"
features = ["urlencode", "loader", "json", "speedups", "unstable_machinery"]
# Additional filters for minijinja
[workspace.dependencies.minijinja-contrib]
version = "2.12.0"
version = "2.21.0"
features = ["pycompat"]
# Utilities to deal with non-zero values
+7
View File
@@ -1,3 +1,4 @@
// Copyright 2026 Element Creations Ltd.
// Copyright 2024, 2025 New Vector Ltd.
// Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
//
@@ -196,6 +197,12 @@ fn find_in_expr<'a>(context: &mut Context, expr: &'a Expr<'a>) -> Result<(), min
find_in_expr(context, &bin_op.left)?;
find_in_expr(context, &bin_op.right)?;
}
Expr::Compare(compare) => {
find_in_expr(context, &compare.expr)?;
for op in &compare.ops {
find_in_expr(context, &op.expr)?;
}
}
Expr::IfExpr(if_expr) => {
find_in_expr(context, &if_expr.test_expr)?;
find_in_expr(context, &if_expr.true_expr)?;