Clippy, edition = "2024"

Author: Kijewski

.github/workflows/rust.yml

@@ -55,8 +55,6 @@ jobs:
         with:
           toolchain: stable
 
-      - uses: Swatinem/rust-cache@v2
-
       - name: Compile project
         run: cargo build --bench template-benchmark --release
 
@@ -74,8 +72,6 @@ jobs:
           toolchain: stable
           components: clippy
 
-      - uses: Swatinem/rust-cache@v2
-
       - name: clippy
         run: cargo clippy -- -D warnings
 
@@ -132,8 +128,6 @@ jobs:
         with:
           toolchain: stable
 
-      - uses: Swatinem/rust-cache@v2
-
       - name: Remove any stale results
         run: rm -rf target/criterion
 

.rustfmt.toml

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

Cargo.toml

@@ -12,12 +12,12 @@ members = [
     "tmpls/tera",
     "tmpls/tinytemplate",
 ]
-resolver = "2"
+resolver = "3"
 
 [package]
 name = "template-benchmark"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"
 
@@ -61,15 +61,15 @@ tera = { version = "*", optional = true, path = "tmpls/tera", package = "tmpl-te
 tinytemplate = { version = "*", optional = true, path = "tmpls/tinytemplate", package = "tmpl-tinytemplate" }
 vy = { version = "*", optional = true, path = "tmpls/vy", package = "tmpl-vy" }
 
-ahash = { version = "0.8.11", features = ["no-rng"] }
-criterion = { version = "0.5.1", features = ["html_reports"] }
-pretty-error-debug = "0.3.1"
-thiserror = "2.0.12"
+ahash = { version = "0.8", features = ["no-rng"] }
+criterion = { version = "0.5", features = ["html_reports"] }
+pretty-error-debug = "0.3"
+thiserror = "2"
 
 [build-dependencies]
 pretty-error-debug = "0.3"
-self_cell = "1.2.0"
-thiserror = "2.0.12"
+self_cell = "1"
+thiserror = "2"
 
 [[bench]]
 name = "template-benchmark"

build.rs

@@ -1,8 +1,11 @@
+#![allow(clippy::uninlined_format_args)] // I don't care
+
 use std::ffi::{OsStr, OsString};
 use std::process::{Command, Stdio};
 
 fn main() -> Result<(), Error> {
-    println!("cargo:rerun-if-changed=Cargo.lock");
+    println!("cargo::rerun-if-changed=build.rs");
+    println!("cargo::rerun-if-changed=Cargo.lock");
 
     let cargo = var_os("CARGO")?;
     let root = var_os("CARGO_MANIFEST_DIR")?;
@@ -55,6 +58,7 @@ fn cargo_tree(cargo: &OsStr, root: &OsStr, package: &str) -> Result<CargoTreeOut
             "--depth=1",
             "--charset=ascii",
             "--all-features",
+            "--color=never",
             "--package",
             package,
         ])
@@ -69,6 +73,7 @@ fn cargo_tree(cargo: &OsStr, root: &OsStr, package: &str) -> Result<CargoTreeOut
     if !output.status.success() {
         return Err(Error::Status(output.status));
     }
+    let _ = dbg!((cargo, root, package, std::str::from_utf8(&output.stdout)));
 
     Ok(CargoTreeOutput::new(
         String::from_utf8(output.stdout).map_err(|_| Error::Utf8)?,

src/main.rs

@@ -125,7 +125,7 @@ fn tmpl<B: Benchmark>(case: Case) -> Result<(), Error> {
     result.map_err(|err| Error::Execution(Box::new(err)))?;
 
     let bytes = from_utf8(output.as_bytes()).map_err(Error::Utf8)?;
-    println!("{}", bytes);
+    println!("{bytes}");
 
     Ok(())
 }

tmpls/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tmpls"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"
 

tmpls/askama/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tmpl-askama"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"
 

tmpls/askama_git/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tmpl-askama_git"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"
 

tmpls/handlebars/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tmpl-handlebars"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"
 

tmpls/horrorshow/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tmpl-horrorshow"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"