Update to askama v0.15

Author: Kijewski

.github/workflows/ci.yml

@@ -123,5 +123,5 @@ jobs:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.83.0"
+          toolchain: "1.88.0"
       - run: cargo check --lib -p askama_web

.rustfmt.toml

@@ -1,4 +1,4 @@
-edition = "2021"
+edition = "2024"
 group_imports = "StdExternalCrate"
 imports_granularity = "Module"
 newline_style = "Unix"

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "askama_web",
     "askama_web_derive",
@@ -17,8 +17,8 @@ members = [
 ]
 
 [workspace.dependencies]
-askama = { version = "0.14.0", default-features = false, features = ["std"] }
-askama_web = { path = "askama_web", version = "0.14.6", default-features = false }
+askama = { version = "0.15.0", default-features = false, features = ["std"] }
+askama_web = { path = "askama_web", version = "0.15.0", default-features = false }
 
 [workspace.lints.rust]
 unknown_lints = { level = "allow", priority = -1 }

askama_web/Cargo.toml

@@ -1,22 +1,22 @@
 [package]
 name = "askama_web"
-version = "0.14.7"
-edition = "2021"
+version = "0.15.0"
+edition = "2024"
 description = "A compatibility add-on for Askama to support many different web frameworks"
 keywords = ["markup", "template", "jinja2", "html"]
 categories = ["template-engine"]
 homepage = "https://askama.readthedocs.io/"
 repository = "https://github.com/askama-rs/askama_web/"
 license = "MIT OR Apache-2.0"
-rust-version = "1.83"
+rust-version = "1.88"
 
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--generate-link-to-definition", "--cfg=docsrs"]
 
 [dependencies]
-askama = { version = "0.14.0", default-features = false, features = ["std"] }
-askama_web_derive = { version = "0.1.0", path = "../askama_web_derive", optional = true }
+askama = { version = "0.15.0", default-features = false, features = ["std"] }
+askama_web_derive = { version = "0.2.0", path = "../askama_web_derive", optional = true }
 
 actix_web_4 = { package = "actix-web", version = "4.0.0", optional = true, default-features = false }
 axum_core_0_4 = { package = "axum-core", version = "0.4.0", optional = true, default-features = false }
@@ -29,15 +29,8 @@ http_1 = { package = "http", version = "1.0.0", optional = true, default-feature
 log_0_4 = { package = "log", version = "0.4.0", optional = true, default-features = false }
 poem_3 = { package = "poem", version = "3.0.0", optional = true, default-features = false }
 rocket_0_5 = { package = "rocket", version = "0.5.0", optional = true, default-features = false }
-salvo_core_0_76 = { package = "salvo_core", version = "0.76.0", optional = true, default-features = false }
-salvo_core_0_77 = { package = "salvo_core", version = "0.77.0", optional = true, default-features = false }
-salvo_core_0_78 = { package = "salvo_core", version = "0.78.0", optional = true, default-features = false }
-salvo_core_0_79 = { package = "salvo_core", version = "0.79.0", optional = true, default-features = false }
-salvo_core_0_80 = { package = "salvo_core", version = "0.80.0", optional = true, default-features = false }
-salvo_core_0_81 = { package = "salvo_core", version = "0.81.0", optional = true, default-features = false }
 tracing_0_1 = { package = "tracing", version = "0.1.0", optional = true, default-features = false }
 trillium_0_2 = { package = "trillium", version = "0.2.0", optional = true, default-features = false }
-viz_core_0_10 = { package = "viz-core", version = "0.10.0", optional = true, default-features = false }
 warp_0_3 = { package = "warp", version = "0.3.3", optional = true, default-features = false }
 warp_0_4 = { package = "warp", version = "0.4.0", optional = true, default-features = false }
 
@@ -55,21 +48,7 @@ derive = ["dep:askama_web_derive"]
 "cot-0.4" = ["dep:cot_0_4"]
 "poem-3" = ["dep:poem_3", "dep:bytes_1", "dep:http_1"]
 "rocket-0.5" = ["dep:rocket_0_5"]
-"salvo-0.76" = ["salvo_core-0.76"]
-"salvo-0.77" = ["salvo_core-0.77"]
-"salvo-0.78" = ["salvo_core-0.78"]
-"salvo-0.79" = ["salvo_core-0.79"]
-"salvo-0.80" = ["salvo_core-0.80"]
-"salvo-0.81" = ["salvo_core-0.81"]
-"salvo_core-0.76" = ["dep:salvo_core_0_76", "dep:bytes_1", "dep:http_1"]
-"salvo_core-0.77" = ["dep:salvo_core_0_77", "dep:bytes_1", "dep:http_1"]
-"salvo_core-0.78" = ["dep:salvo_core_0_78", "dep:bytes_1", "dep:http_1"]
-"salvo_core-0.79" = ["dep:salvo_core_0_79", "dep:bytes_1", "dep:http_1"]
-"salvo_core-0.80" = ["dep:salvo_core_0_80", "dep:bytes_1", "dep:http_1"]
-"salvo_core-0.81" = ["dep:salvo_core_0_81", "dep:bytes_1", "dep:http_1"]
 "trillium-0.2" = ["dep:trillium_0_2"]
-"viz-0.10" = ["viz-core-0.10"]
-"viz-core-0.10" = ["dep:viz_core_0_10", "dep:http_1"]
 "warp-0.3" = ["dep:warp_0_3", "dep:bytes_1", "dep:http_0_2"]
 "warp-0.4" = ["dep:warp_0_4", "dep:bytes_1", "dep:http_1"]
 

askama_web/src/implementation/mod.rs

@@ -30,22 +30,8 @@ pub mod cot_0_4;
 pub mod poem_3;
 #[cfg(feature = "rocket-0.5")]
 pub mod rocket_0_5;
-#[cfg(feature = "salvo_core-0.76")]
-pub mod salvo_core_0_76;
-#[cfg(feature = "salvo_core-0.77")]
-pub mod salvo_core_0_77;
-#[cfg(feature = "salvo_core-0.78")]
-pub mod salvo_core_0_78;
-#[cfg(feature = "salvo_core-0.79")]
-pub mod salvo_core_0_79;
-#[cfg(feature = "salvo_core-0.80")]
-pub mod salvo_core_0_80;
-#[cfg(feature = "salvo_core-0.81")]
-pub mod salvo_core_0_81;
 #[cfg(feature = "trillium-0.2")]
 pub mod trillium_0_2;
-#[cfg(feature = "viz-core-0.10")]
-pub mod viz_core_0_10;
 #[cfg(feature = "warp-0.3")]
 pub mod warp_0_3;
 #[cfg(feature = "warp-0.4")]
@@ -65,22 +51,8 @@ pub use noop as cot_0_4;
 pub use noop as poem_3;
 #[cfg(all(feature = "derive", not(feature = "rocket-0.5")))]
 pub use noop as rocket_0_5;
-#[cfg(all(feature = "derive", not(feature = "salvo_core-0.76")))]
-pub use noop as salvo_core_0_76;
-#[cfg(all(feature = "derive", not(feature = "salvo_core-0.77")))]
-pub use noop as salvo_core_0_77;
-#[cfg(all(feature = "derive", not(feature = "salvo_core-0.78")))]
-pub use noop as salvo_core_0_78;
-#[cfg(all(feature = "derive", not(feature = "salvo_core-0.79")))]
-pub use noop as salvo_core_0_79;
-#[cfg(all(feature = "derive", not(feature = "salvo_core-0.80")))]
-pub use noop as salvo_core_0_80;
-#[cfg(all(feature = "derive", not(feature = "salvo_core-0.81")))]
-pub use noop as salvo_core_0_81;
 #[cfg(all(feature = "derive", not(feature = "trillium-0.2")))]
 pub use noop as trillium_0_2;
-#[cfg(all(feature = "derive", not(feature = "viz-core-0.10")))]
-pub use noop as viz_core_0_10;
 #[cfg(all(feature = "derive", not(feature = "warp-0.3")))]
 pub use noop as warp_0_3;
 #[cfg(all(feature = "derive", not(feature = "warp-0.4")))]
@@ -98,14 +70,7 @@ macro_rules! __askama_web_impl {
         $crate::__askama_web_impl::cot_0_4::derive!(@ $ast);
         $crate::__askama_web_impl::poem_3::derive!(@ $ast);
         $crate::__askama_web_impl::rocket_0_5::derive!(@ $ast);
-        $crate::__askama_web_impl::salvo_core_0_76::derive!(@ $ast);
-        $crate::__askama_web_impl::salvo_core_0_77::derive!(@ $ast);
-        $crate::__askama_web_impl::salvo_core_0_78::derive!(@ $ast);
-        $crate::__askama_web_impl::salvo_core_0_79::derive!(@ $ast);
-        $crate::__askama_web_impl::salvo_core_0_80::derive!(@ $ast);
-        $crate::__askama_web_impl::salvo_core_0_81::derive!(@ $ast);
         $crate::__askama_web_impl::trillium_0_2::derive!(@ $ast);
-        $crate::__askama_web_impl::viz_core_0_10::derive!(@ $ast);
         $crate::__askama_web_impl::warp_0_3::derive!(@ $ast);
         $crate::__askama_web_impl::warp_0_4::derive!(@ $ast);
     };