feat: switch to rinja (#92)

rinja is a more modern, featureful and maintained fork of askama.
It will provide us with a nicer templating system that will most
likely get much more attention in the future given it's what is used
on docs.rs currently.

Author: m4tx

Cargo.lock

@@ -23,9 +23,6 @@ pedantic = "warn"
 
 [workspace.dependencies]
 anyhow = "1.0.95"
-askama = "0.12.1"
-askama_derive = "0.12.5"
-askama_parser = "0.2.1"
 async-stream = "0.3"
 async-trait = "0.1"
 axum = { version = "0.7", default-features = false }
@@ -52,6 +49,7 @@ hmac = "0.13.0-pre.4"
 http = "1.1"
 http-body = "1"
 http-body-util = "0.1"
+humansize = "2.1.3"
 indexmap = "2"
 mime_guess = { version = "2", default-features = false }
 mockall = "0.13"
@@ -61,6 +59,7 @@ prettyplease = "0.2"
 proc-macro-crate = "3"
 proc-macro2 = { version = "1", default-features = false }
 quote = { version = "1", default-features = false }
+rinja = "0.3.5"
 rustversion = "1"
 sea-query = { version = "0.32.0-rc.2", default-features = false }
 sea-query-binder = { version = "0.7.0-rc.2", default-features = false }

Cargo.toml

@@ -6,5 +6,5 @@ description = "Sessions - Flareon example."
 edition = "2021"
 
 [dependencies]
-askama = "0.12.1"
 flareon = { path = "../../flareon" }
+rinja = "0.3.5"

examples/sessions/Cargo.toml

@@ -1,10 +1,10 @@
-use askama::Template;
 use flareon::forms::Form;
 use flareon::middleware::SessionMiddleware;
 use flareon::request::{Request, RequestExt};
 use flareon::response::{Response, ResponseExt};
 use flareon::router::{Route, Router};
 use flareon::{reverse, Body, FlareonApp, FlareonProject, StatusCode};
+use rinja::Template;
 
 #[derive(Debug, Template)]
 #[template(path = "index.html")]

examples/sessions/src/main.rs

@@ -6,5 +6,5 @@ description = "TODO List - Flareon example."
 edition = "2021"
 
 [dependencies]
-askama = "0.12.1"
 flareon = { path = "../../flareon" }
+rinja = "0.3.5"

examples/todo-list/Cargo.toml

@@ -1,6 +1,5 @@
 mod migrations;
 
-use askama::Template;
 use flareon::config::{DatabaseConfig, ProjectConfig};
 use flareon::db::migrations::DynMigration;
 use flareon::db::{model, query, Model};
@@ -9,6 +8,7 @@ use flareon::request::{Request, RequestExt};
 use flareon::response::{Response, ResponseExt};
 use flareon::router::{Route, Router};
 use flareon::{reverse, Body, FlareonApp, FlareonProject, StatusCode};
+use rinja::Template;
 
 #[derive(Debug, Clone)]
 #[model]

examples/todo-list/src/main.rs

@@ -9,9 +9,6 @@ description = "Modern web framework focused on speed and ease of use."
 workspace = true
 
 [dependencies]
-askama.workspace = true
-askama_derive.workspace = true
-askama_parser.workspace = true
 async-trait.workspace = true
 axum = { workspace = true, features = ["http1", "tokio"] }
 backtrace.workspace = true
@@ -28,10 +25,12 @@ hmac.workspace = true
 http-body-util.workspace = true
 http-body.workspace = true
 http.workspace = true
+humansize.workspace = true
 indexmap.workspace = true
 mime_guess.workspace = true
 password-auth = { workspace = true, features = ["std", "argon2"] }
 pin-project-lite.workspace = true
+rinja.workspace = true
 sea-query = { workspace = true }
 sea-query-binder = { workspace = true, features = ["with-chrono", "runtime-tokio"] }
 serde = { workspace = true, features = ["derive"] }
@@ -59,10 +58,9 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [package.metadata.cargo-machete]
 ignored = [
-    # askama doesn't seem to be working with minimal versions of its dependencies at the moment,
+    # rinja doesn't seem to be working with minimal versions of its dependencies at the moment,
     # so we're manually setting the required versions in the main crate.
-    "askama_derive",
-    "askama_parser",
+    "humansize",
     # time requires version 0.3.35 to work with the latest versions of Rust, but we don't use it directly
     "time",
 ]

flareon/Cargo.toml

@@ -5,10 +5,10 @@
 
 use std::marker::PhantomData;
 
-use askama::Template;
 use async_trait::async_trait;
 use bytes::Bytes;
 use derive_more::Debug;
+use rinja::Template;
 
 use crate::auth::AuthRequestExt;
 use crate::forms::fields::Password;

flareon/src/admin.rs

@@ -60,13 +60,13 @@ macro_rules! impl_error_from_repr {
     };
 }
 
-impl From<Error> for askama::Error {
+impl From<Error> for rinja::Error {
     fn from(value: Error) -> Self {
-        askama::Error::Custom(Box::new(value))
+        rinja::Error::Custom(Box::new(value))
     }
 }
 
-impl_error_from_repr!(askama::Error);
+impl_error_from_repr!(rinja::Error);
 impl_error_from_repr!(crate::router::path::ReverseError);
 #[cfg(feature = "db")]
 impl_error_from_repr!(crate::db::DatabaseError);
@@ -105,7 +105,7 @@ pub(crate) enum ErrorRepr {
     ReverseError(#[from] crate::router::path::ReverseError),
     /// An error occurred while trying to render a template.
     #[error("Failed to render template: {0}")]
-    TemplateRender(#[from] askama::Error),
+    TemplateRender(#[from] rinja::Error),
     /// An error occurred while communicating with the database.
     #[error("Database error: {0}")]
     #[cfg(feature = "db")]

flareon/src/error.rs

@@ -2,7 +2,7 @@ use std::any::Any;
 use std::panic::PanicHookInfo;
 use std::sync::Arc;
 
-use askama::Template;
+use rinja::Template;
 use tracing::error;
 
 use crate::error::backtrace::{Backtrace, __flareon_create_backtrace};