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

generator: add missing lifetimes

Browse Source
This commit is contained in:
René Kijewski 2025-04-17 17:13:48 +02:00 committed by René Kijewski
parent 9f9a7dcf43
commit 4fe13a0053
3 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
askama_derive/src/generator/expr.rs
View File

@ -16,7 +16,7 @@ impl<'a> Generator<'a, '_> {
pub(crate) fn visit_expr_root(
&mut self,
ctx: &Context<'_>,
expr: &WithSpan<'_, Expr<'a>>,
expr: &WithSpan<'a, Expr<'a>>,
) -> Result<String, CompileError> {
let mut buf = Buffer::new();
self.visit_expr(ctx, &mut buf, expr)?;
@ -27,7 +27,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
expr: &WithSpan<'_, Expr<'a>>,
expr: &WithSpan<'a, Expr<'a>>,
) -> Result<DisplayWrap, CompileError> {
Ok(match **expr {
Expr::BoolLit(s) => self.visit_bool_lit(buf, s),
@ -79,7 +79,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
expr: &WithSpan<'_, Expr<'a>>,
expr: &WithSpan<'a, Expr<'a>>,
) -> Result<DisplayWrap, CompileError> {
match **expr {
Expr::BinOp(op @ ("||" | "&&"), ref left, _) => {
@ -100,7 +100,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
expr: &WithSpan<'_, Expr<'a>>,
expr: &WithSpan<'a, Expr<'a>>,
prev_display_wrap: DisplayWrap,
) -> Result<DisplayWrap, CompileError> {
match **expr {
@ -119,7 +119,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
expr: &WithSpan<'_, Expr<'a>>,
expr: &WithSpan<'a, Expr<'a>>,
) -> Result<(), CompileError> {
match &**expr {
Expr::BoolLit(_) | Expr::IsDefined(_) | Expr::IsNotDefined(_) => {
@ -168,7 +168,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
expr: &WithSpan<'_, Expr<'a>>,
expr: &WithSpan<'a, Expr<'a>>,
target: &str,
) -> Result<DisplayWrap, CompileError> {
buf.write("askama::helpers::get_primitive_value(&(");
@ -183,7 +183,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
exprs: &[WithSpan<'_, Expr<'a>>],
exprs: &[WithSpan<'a, Expr<'a>>],
) -> Result<DisplayWrap, CompileError> {
match exprs {
[] => unreachable!(),
@ -204,7 +204,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
cond: &WithSpan<'_, CondTest<'a>>,
cond: &WithSpan<'a, CondTest<'a>>,
) -> Result<DisplayWrap, CompileError> {
let mut expr_buf = Buffer::new();
let display_wrap = self.visit_expr_first(ctx, &mut expr_buf, &cond.expr)?;
@ -220,7 +220,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
expr: &WithSpan<'_, Expr<'a>>,
expr: &WithSpan<'a, Expr<'a>>,
) -> Result<DisplayWrap, CompileError> {
buf.write("match (");
self.visit_expr(ctx, buf, expr)?;
@ -243,8 +243,8 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
generics: &[WithSpan<'_, TyGenerics<'_>>],
args: &[WithSpan<'a, Expr<'a>>],
generics: &[WithSpan<'a, TyGenerics<'a>>],
node: Span<'_>,
kind: &str,
) -> Result<DisplayWrap, CompileError> {
@ -274,7 +274,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
) -> Result<(), CompileError> {
for (i, arg) in args.iter().enumerate() {
if i > 0 {
@ -289,7 +289,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
arg: &WithSpan<'_, Expr<'a>>,
arg: &WithSpan<'a, Expr<'a>>,
) -> Result<(), CompileError> {
self.visit_arg_inner(ctx, buf, arg, false)
}
@ -298,7 +298,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
arg: &WithSpan<'_, Expr<'a>>,
arg: &WithSpan<'a, Expr<'a>>,
// This parameter is needed because even though Expr::Unary is not copyable, we might still
// be able to skip a few levels.
need_borrow: bool,
@ -331,7 +331,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
arg: &WithSpan<'_, Expr<'a>>,
arg: &WithSpan<'a, Expr<'a>>,
) -> Result<(), CompileError> {
if let Some(Writable::Lit(arg)) = compile_time_escape(arg, self.input.escaper) {
if !arg.is_empty() {
@ -356,8 +356,8 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
obj: &WithSpan<'_, Expr<'a>>,
attr: &Attr<'_>,
obj: &WithSpan<'a, Expr<'a>>,
attr: &Attr<'a>,
) -> Result<DisplayWrap, CompileError> {
if let Expr::Var(name) = **obj {
if name == "loop" {
@ -387,7 +387,7 @@ impl<'a> Generator<'a, '_> {
pub(super) fn visit_call_generics(
&mut self,
buf: &mut Buffer,
generics: &[WithSpan<'_, TyGenerics<'_>>],
generics: &[WithSpan<'a, TyGenerics<'a>>],
) {
if generics.is_empty() {
return;
@ -396,7 +396,7 @@ impl<'a> Generator<'a, '_> {
self.visit_ty_generics(buf, generics);
}
fn visit_ty_generics(&mut self, buf: &mut Buffer, generics: &[WithSpan<'_, TyGenerics<'_>>]) {
fn visit_ty_generics(&mut self, buf: &mut Buffer, generics: &[WithSpan<'a, TyGenerics<'a>>]) {
if generics.is_empty() {
return;
}
@ -411,7 +411,7 @@ impl<'a> Generator<'a, '_> {
pub(super) fn visit_ty_generic(
&mut self,
buf: &mut Buffer,
generic: &WithSpan<'_, TyGenerics<'_>>,
generic: &WithSpan<'a, TyGenerics<'a>>,
) {
let TyGenerics { refs, path, args } = &**generic;
for _ in 0..*refs {
@ -425,8 +425,8 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
obj: &WithSpan<'_, Expr<'a>>,
key: &WithSpan<'_, Expr<'a>>,
obj: &WithSpan<'a, Expr<'a>>,
key: &WithSpan<'a, Expr<'a>>,
) -> Result<DisplayWrap, CompileError> {
buf.write('&');
self.visit_expr(ctx, buf, obj)?;
@ -440,9 +440,9 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
left: &WithSpan<'_, Expr<'a>>,
args: &[WithSpan<'_, Expr<'a>>],
generics: &[WithSpan<'_, TyGenerics<'_>>],
left: &WithSpan<'a, Expr<'a>>,
args: &[WithSpan<'a, Expr<'a>>],
generics: &[WithSpan<'a, TyGenerics<'a>>],
) -> Result<DisplayWrap, CompileError> {
match &**left {
Expr::Attr(sub_left, Attr { name, .. }) if ***sub_left == Expr::Var("loop") => {
@ -530,7 +530,7 @@ impl<'a> Generator<'a, '_> {
ctx: &Context<'_>,
buf: &mut Buffer,
op: &str,
inner: &WithSpan<'_, Expr<'a>>,
inner: &WithSpan<'a, Expr<'a>>,
) -> Result<DisplayWrap, CompileError> {
buf.write(op);
self.visit_expr(ctx, buf, inner)?;
@ -542,8 +542,8 @@ impl<'a> Generator<'a, '_> {
ctx: &Context<'_>,
buf: &mut Buffer,
op: &str,
left: Option<&WithSpan<'_, Expr<'a>>>,
right: Option<&WithSpan<'_, Expr<'a>>>,
left: Option<&WithSpan<'a, Expr<'a>>>,
right: Option<&WithSpan<'a, Expr<'a>>>,
) -> Result<DisplayWrap, CompileError> {
if let Some(left) = left {
self.visit_expr(ctx, buf, left)?;
@ -560,8 +560,8 @@ impl<'a> Generator<'a, '_> {
ctx: &Context<'_>,
buf: &mut Buffer,
op: &str,
left: &WithSpan<'_, Expr<'a>>,
right: &WithSpan<'_, Expr<'a>>,
left: &WithSpan<'a, Expr<'a>>,
right: &WithSpan<'a, Expr<'a>>,
) -> Result<DisplayWrap, CompileError> {
self.visit_expr(ctx, buf, left)?;
buf.write(format_args!(" {op} "));
@ -573,7 +573,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
inner: &WithSpan<'_, Expr<'a>>,
inner: &WithSpan<'a, Expr<'a>>,
) -> Result<DisplayWrap, CompileError> {
buf.write('(');
self.visit_expr(ctx, buf, inner)?;
@ -585,7 +585,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
exprs: &[WithSpan<'_, Expr<'a>>],
exprs: &[WithSpan<'a, Expr<'a>>],
) -> Result<DisplayWrap, CompileError> {
buf.write('(');
for (index, expr) in exprs.iter().enumerate() {
@ -603,7 +603,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
expr: &WithSpan<'_, Expr<'a>>,
expr: &WithSpan<'a, Expr<'a>>,
) -> Result<DisplayWrap, CompileError> {
self.visit_expr(ctx, buf, expr)?;
Ok(DisplayWrap::Unwrapped)
@ -613,7 +613,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
elements: &[WithSpan<'_, Expr<'a>>],
elements: &[WithSpan<'a, Expr<'a>>],
) -> Result<DisplayWrap, CompileError> {
buf.write('[');
for (i, el) in elements.iter().enumerate() {

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

@ -13,8 +13,8 @@ impl<'a> Generator<'a, '_> {
ctx: &Context<'_>,
buf: &mut Buffer,
name: &str,
args: &[WithSpan<'_, Expr<'a>>],
generics: &[WithSpan<'_, TyGenerics<'_>>],
args: &[WithSpan<'a, Expr<'a>>],
generics: &[WithSpan<'a, TyGenerics<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
let filter = match name {
@ -53,8 +53,8 @@ impl<'a> Generator<'a, '_> {
ctx: &Context<'_>,
buf: &mut Buffer,
name: &str,
args: &[WithSpan<'_, Expr<'a>>],
generics: &[WithSpan<'_, TyGenerics<'_>>],
args: &[WithSpan<'a, Expr<'a>>],
generics: &[WithSpan<'a, TyGenerics<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
if BUILTIN_FILTERS_NEED_ALLOC.contains(&name) {
@ -78,8 +78,8 @@ impl<'a> Generator<'a, '_> {
ctx: &Context<'_>,
buf: &mut Buffer,
name: &str,
args: &[WithSpan<'_, Expr<'a>>],
generics: &[WithSpan<'_, TyGenerics<'_>>],
args: &[WithSpan<'a, Expr<'a>>],
generics: &[WithSpan<'a, TyGenerics<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
if !generics.is_empty() {
@ -99,7 +99,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
self.visit_urlencode_filter_inner(ctx, buf, "urlencode", args, node)
@ -109,7 +109,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
self.visit_urlencode_filter_inner(ctx, buf, "urlencode_strict", args, node)
@ -120,7 +120,7 @@ impl<'a> Generator<'a, '_> {
ctx: &Context<'_>,
buf: &mut Buffer,
name: &str,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
if cfg!(not(feature = "urlencode")) {
@ -143,7 +143,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
ensure_filter_has_feature_alloc(ctx, "wordcount", node)?;
@ -174,7 +174,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
_node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
// All filters return numbers, and any default formatted number is HTML safe.
@ -191,7 +191,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
const SINGULAR: &WithSpan<'static, Expr<'static>> =
@ -234,7 +234,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
self.visit_linebreaks_filters(ctx, buf, "paragraphbreaks", args, node)
@ -244,7 +244,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
self.visit_linebreaks_filters(ctx, buf, "linebreaksbr", args, node)
@ -254,7 +254,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
self.visit_linebreaks_filters(ctx, buf, "linebreaks", args, node)
@ -265,7 +265,7 @@ impl<'a> Generator<'a, '_> {
ctx: &Context<'_>,
buf: &mut Buffer,
name: &str,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
ensure_filter_has_feature_alloc(ctx, name, node)?;
@ -289,7 +289,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
let arg = match args {
@ -305,7 +305,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
let arg = match args {
@ -321,7 +321,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
if cfg!(not(feature = "serde_json")) {
@ -346,7 +346,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
const FALSE: &WithSpan<'static, Expr<'static>> =
@ -379,7 +379,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
if args.len() != 1 {
@ -395,7 +395,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
if args.len() > 2 {
@ -455,7 +455,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
ensure_filter_has_feature_alloc(ctx, "format", node)?;
@ -478,7 +478,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
ensure_filter_has_feature_alloc(ctx, "fmt", node)?;
@ -500,7 +500,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
args: &[WithSpan<'_, Expr<'a>>],
args: &[WithSpan<'a, Expr<'a>>],
_node: Span<'_>,
) -> Result<DisplayWrap, CompileError> {
buf.write("askama::filters::join((&");

12
askama_derive/src/generator/node.rs
View File

@ -506,7 +506,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'a>,
buf: &mut Buffer,
loop_block: &'a WithSpan<'_, Loop<'_>>,
loop_block: &'a WithSpan<'a, Loop<'_>>,
) -> Result<usize, CompileError> {
self.handle_ws(loop_block.ws1);
self.push_locals(|this| {
@ -592,7 +592,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'a>,
buf: &mut Buffer,
call: &'a WithSpan<'_, Call<'_>>,
call: &'a WithSpan<'a, Call<'_>>,
) -> Result<usize, CompileError> {
let Call {
ws,
@ -769,7 +769,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'a>,
buf: &mut Buffer,
filter: &'a WithSpan<'_, FilterBlock<'_>>,
filter: &'a WithSpan<'a, FilterBlock<'_>>,
) -> Result<usize, CompileError> {
self.write_buf_writable(ctx, buf)?;
self.flush_ws(filter.ws1);
@ -828,7 +828,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'a>,
buf: &mut Buffer,
i: &'a WithSpan<'_, Include<'_>>,
i: &'a WithSpan<'a, Include<'_>>,
) -> Result<usize, CompileError> {
self.flush_ws(i.ws);
self.write_buf_writable(ctx, buf)?;
@ -936,7 +936,7 @@ impl<'a> Generator<'a, '_> {
&mut self,
ctx: &Context<'_>,
buf: &mut Buffer,
l: &'a WithSpan<'_, Let<'_>>,
l: &'a WithSpan<'a, Let<'_>>,
) -> Result<(), CompileError> {
self.handle_ws(l.ws);
@ -1195,7 +1195,7 @@ impl<'a> Generator<'a, '_> {
Ok(size_hint)
}
fn write_comment(&mut self, comment: &'a WithSpan<'_, Comment<'_>>) {
fn write_comment(&mut self, comment: &'a WithSpan<'a, Comment<'_>>) {
self.handle_ws(comment.ws);
}