Update to new rinja version (askama 0.13)

GuillaumeGomez · GuillaumeGomez · commit 139f11b63a94 · 2025-04-07T13:44:55.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -90,7 +90,7 @@ tempfile = "3.1.0"
 fn-error-context = "0.2.0"
 
 # Templating
-rinja = "0.3.4"
+askama = "0.13"
 walkdir = "2"
 
 # Date and Time utilities
diff --git a/src/utils/html.rs b/src/utils/html.rs
@@ -1,8 +1,8 @@
 use crate::web::page::templates::{Body, Head, Vendored};
 use crate::web::rustdoc::RustdocPage;
+use askama::Template;
 use lol_html::element;
 use lol_html::errors::RewritingError;
-use rinja::Template;
 
 /// Rewrite a rustdoc page to have the docs.rs topbar
 ///
@@ -45,7 +45,7 @@ pub(crate) fn rewrite_lol(
         rustdoc_body_class.set_attribute("tabindex", "-1")?;
         // Change the `body` to a `div`
         rustdoc_body_class.set_tag_name("div")?;
-        // Prepend the rinja content
+        // Prepend the askama content
         rustdoc_body_class.prepend(&body_html, ContentType::Html);
         // Wrap the transformed body and topbar into a <body> element
         rustdoc_body_class.before(r#"<body class="rustdoc-page">"#, ContentType::Html);
diff --git a/src/web/build_details.rs b/src/web/build_details.rs
@@ -12,10 +12,10 @@ use crate::{
     },
 };
 use anyhow::Context as _;
+use askama::Template;
 use axum::{extract::Extension, response::IntoResponse};
 use chrono::{DateTime, Utc};
 use futures_util::TryStreamExt;
-use rinja::Template;
 use semver::Version;
 use serde::Deserialize;
 use std::sync::Arc;
diff --git a/src/web/builds.rs b/src/web/builds.rs
@@ -17,6 +17,7 @@ use crate::{
     },
 };
 use anyhow::{Result, anyhow};
+use askama::Template;
 use axum::{
     Json, extract::Extension, http::header::ACCESS_CONTROL_ALLOW_ORIGIN, response::IntoResponse,
 };
@@ -27,7 +28,6 @@ use axum_extra::{
 use chrono::{DateTime, Utc};
 use constant_time_eq::constant_time_eq;
 use http::StatusCode;
-use rinja::Template;
 use semver::Version;
 use std::sync::Arc;
 
diff --git a/src/web/crate_details.rs b/src/web/crate_details.rs
@@ -18,14 +18,14 @@ use crate::{
     },
 };
 use anyhow::{Context, Result, anyhow};
+use askama::Template;
 use axum::{
     extract::Extension,
     response::{IntoResponse, Response as AxumResponse},
 };
 use chrono::{DateTime, Utc};
 use futures_util::stream::TryStreamExt;
 use log::warn;
-use rinja::Template;
 use semver::Version;
 use serde::Deserialize;
 use serde_json::Value;
diff --git a/src/web/features.rs b/src/web/features.rs
@@ -13,8 +13,8 @@ use crate::{
     },
 };
 use anyhow::anyhow;
+use askama::Template;
 use axum::response::IntoResponse;
-use rinja::Template;
 use serde_json::Value;
 use std::collections::{BTreeMap, HashMap, HashSet, VecDeque};
 
diff --git a/src/web/mod.rs b/src/web/mod.rs
@@ -10,8 +10,8 @@ use crate::utils::get_correct_docsrs_style_file;
 use crate::utils::report_error;
 use crate::web::page::templates::{RenderSolid, filters};
 use anyhow::{Context as _, Result, anyhow, bail};
+use askama::Template;
 use axum_extra::middleware::option_layer;
-use rinja::Template;
 use serde_json::Value;
 use tracing::{info, instrument};
 
diff --git a/src/web/page/templates.rs b/src/web/page/templates.rs
@@ -1,7 +1,7 @@
 use crate::error::Result;
 use crate::web::rustdoc::RustdocPage;
 use anyhow::Context;
-use rinja::Template;
+use askama::Template;
 use std::sync::Arc;
 use tracing::trace;
 
@@ -88,12 +88,12 @@ impl TemplateData {
 }
 
 pub mod filters {
+    use askama::filters::Safe;
     use chrono::{DateTime, Utc};
-    use rinja::filters::Safe;
     use std::borrow::Cow;
 
     // Copied from `tera`.
-    pub fn escape_html(input: &str) -> rinja::Result<Cow<'_, str>> {
+    pub fn escape_html(input: &str) -> askama::Result<Cow<'_, str>> {
         if !input.chars().any(|c| "&<>\"'/".contains(c)) {
             return Ok(Cow::Borrowed(input));
         }
@@ -115,7 +115,7 @@ pub mod filters {
     }
 
     // Copied from `tera`.
-    pub fn escape_xml(input: &str) -> rinja::Result<Cow<'_, str>> {
+    pub fn escape_xml(input: &str) -> askama::Result<Cow<'_, str>> {
         if !input.chars().any(|c| "&<>\"'".contains(c)) {
             return Ok(Cow::Borrowed(input));
         }
@@ -135,11 +135,11 @@ pub mod filters {
 
     /// Prettily format a timestamp
     // TODO: This can be replaced by chrono
-    pub fn timeformat(value: &DateTime<Utc>) -> rinja::Result<String> {
+    pub fn timeformat(value: &DateTime<Utc>) -> askama::Result<String> {
         Ok(crate::web::duration_to_str(*value))
     }
 
-    pub fn format_secs(mut value: f32) -> rinja::Result<String> {
+    pub fn format_secs(mut value: f32) -> askama::Result<String> {
         const TIMES: &[&str] = &["seconds", "minutes", "hours"];
 
         let mut chosen_time = &TIMES[0];
@@ -167,7 +167,7 @@ pub mod filters {
     pub fn dedent<T: std::fmt::Display, I: Into<Option<i32>>>(
         value: T,
         levels: I,
-    ) -> rinja::Result<String> {
+    ) -> askama::Result<String> {
         let string = value.to_string();
 
         let unindented = if let Some(levels) = levels.into() {
@@ -200,7 +200,7 @@ pub mod filters {
         Ok(unindented)
     }
 
-    pub fn highlight(code: impl std::fmt::Display, lang: &str) -> rinja::Result<Safe<String>> {
+    pub fn highlight(code: impl std::fmt::Display, lang: &str) -> askama::Result<Safe<String>> {
         let highlighted_code =
             crate::web::highlight::with_lang(Some(lang), &code.to_string(), None);
         Ok(Safe(format!(
@@ -209,7 +209,7 @@ pub mod filters {
         )))
     }
 
-    pub fn round(value: &f32, precision: u32) -> rinja::Result<String> {
+    pub fn round(value: &f32, precision: u32) -> askama::Result<String> {
         let multiplier = if precision == 0 {
             1.0
         } else {
@@ -218,43 +218,43 @@ pub mod filters {
         Ok(((multiplier * *value).round() / multiplier).to_string())
     }
 
-    pub fn split_first<'a>(value: &'a str, pat: &str) -> rinja::Result<Option<&'a str>> {
+    pub fn split_first<'a>(value: &'a str, pat: &str) -> askama::Result<Option<&'a str>> {
         Ok(value.split(pat).next())
     }
 
-    pub fn json_encode<T: ?Sized + serde::Serialize>(value: &T) -> rinja::Result<Safe<String>> {
+    pub fn json_encode<T: ?Sized + serde::Serialize>(value: &T) -> askama::Result<Safe<String>> {
         Ok(Safe(
             serde_json::to_string(value).expect("`encode_json` failed"),
         ))
     }
 }
 
 pub trait RenderSolid {
-    fn render_solid(&self, fw: bool, spin: bool, extra: &str) -> rinja::filters::Safe<String>;
+    fn render_solid(&self, fw: bool, spin: bool, extra: &str) -> askama::filters::Safe<String>;
 }
 
 impl<T: font_awesome_as_a_crate::Solid> RenderSolid for T {
-    fn render_solid(&self, fw: bool, spin: bool, extra: &str) -> rinja::filters::Safe<String> {
+    fn render_solid(&self, fw: bool, spin: bool, extra: &str) -> askama::filters::Safe<String> {
         render("fa-solid", self.icon_name(), fw, spin, extra)
     }
 }
 
 pub trait RenderRegular {
-    fn render_regular(&self, fw: bool, spin: bool, extra: &str) -> rinja::filters::Safe<String>;
+    fn render_regular(&self, fw: bool, spin: bool, extra: &str) -> askama::filters::Safe<String>;
 }
 
 impl<T: font_awesome_as_a_crate::Regular> RenderRegular for T {
-    fn render_regular(&self, fw: bool, spin: bool, extra: &str) -> rinja::filters::Safe<String> {
+    fn render_regular(&self, fw: bool, spin: bool, extra: &str) -> askama::filters::Safe<String> {
         render("fa-regular", self.icon_name(), fw, spin, extra)
     }
 }
 
 pub trait RenderBrands {
-    fn render_brands(&self, fw: bool, spin: bool, extra: &str) -> rinja::filters::Safe<String>;
+    fn render_brands(&self, fw: bool, spin: bool, extra: &str) -> askama::filters::Safe<String>;
 }
 
 impl<T: font_awesome_as_a_crate::Brands> RenderBrands for T {
-    fn render_brands(&self, fw: bool, spin: bool, extra: &str) -> rinja::filters::Safe<String> {
+    fn render_brands(&self, fw: bool, spin: bool, extra: &str) -> askama::filters::Safe<String> {
         render("fa-brands", self.icon_name(), fw, spin, extra)
     }
 }
@@ -265,7 +265,7 @@ fn render(
     fw: bool,
     spin: bool,
     extra: &str,
-) -> rinja::filters::Safe<String> {
+) -> askama::filters::Safe<String> {
     let mut classes = Vec::new();
     if fw {
         classes.push("fa-fw");
@@ -281,5 +281,5 @@ fn render(
         classes = classes.join(" "),
     );
 
-    rinja::filters::Safe(icon)
+    askama::filters::Safe(icon)
 }
diff --git a/src/web/page/web_page.rs b/src/web/page/web_page.rs
@@ -10,7 +10,7 @@ use http::header::CONTENT_LENGTH;
 use std::sync::Arc;
 
 pub(crate) trait AddCspNonce: IntoResponse {
-    fn render_with_csp_nonce(&mut self, csp_nonce: String) -> rinja::Result<String>;
+    fn render_with_csp_nonce(&mut self, csp_nonce: String) -> askama::Result<String>;
 }
 
 #[macro_export]
@@ -25,7 +25,7 @@ macro_rules! impl_axum_webpage {
         $(,)?
     ) => {
         impl $crate::web::page::web_page::AddCspNonce for $page {
-            fn render_with_csp_nonce(&mut self, csp_nonce: String) -> rinja::Result<String> {
+            fn render_with_csp_nonce(&mut self, csp_nonce: String) -> askama::Result<String> {
                 self.csp_nonce = csp_nonce;
                 self.render()
             }
diff --git a/src/web/releases.rs b/src/web/releases.rs
@@ -14,6 +14,7 @@ use crate::{
     },
 };
 use anyhow::{Context as _, Result, anyhow};
+use askama::Template;
 use axum::{
     extract::{Extension, Query},
     response::{IntoResponse, Response as AxumResponse},
@@ -22,7 +23,6 @@ use base64::{Engine, engine::general_purpose::STANDARD as b64};
 use chrono::{DateTime, Utc};
 use futures_util::stream::TryStreamExt;
 use itertools::Itertools;
-use rinja::Template;
 use serde::{Deserialize, Serialize};
 use sqlx::Row;
 use std::collections::{BTreeMap, HashMap, HashSet};
diff --git a/src/web/routes.rs b/src/web/routes.rs
diff --git a/src/web/rustdoc.rs b/src/web/rustdoc.rs
diff --git a/src/web/sitemap.rs b/src/web/sitemap.rs
diff --git a/src/web/source.rs b/src/web/source.rs
