From debd3795e93e854cc735a534a34cf6dbebba6a36 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sat, 22 Feb 2025 15:44:44 +0100
Subject: [PATCH] Migrate to the 2024 rust edition

---
 Cargo.toml   | 7 ++-----
 rustfmt.toml | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 rustfmt.toml

diff --git a/Cargo.toml b/Cargo.toml
index 9057a7e..162cebc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["showbits-assets", "showbits-common", "showbits-thermal-printer"]
 
 [workspace.package]
 version = "0.0.0"
-edition = "2021"
+edition = "2024"
 
 [workspace.dependencies]
 anyhow = "1.0.83"
@@ -54,9 +54,6 @@ rust.unused_lifetimes = "warn"
 rust.unused_qualifications = "warn"
 # Clippy
 clippy.use_self = "warn"
-# Migrating to the 2024 edition
-rust.rust_2024_compatibility = "warn"
-rust.tail_expr_drop_order = { level = "allow", priority = 1 }
 
 # Optimize dependencies in debug mode (mainly for faster image exports).
 # Does not apply to workspace members, only "real" dependencies.
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 0000000..8153a3d
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1 @@
+style_edition = "2021"