feat: upgrade to rust 2024

Author: elringus

crates/Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "abi"
 version = "0.0.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

crates/abi/Cargo.toml

@@ -1,21 +1,23 @@
 //! C/C++ application binary interface of the library.
 
+#![allow(unsafe_op_in_unsafe_fn)]
+
 mod models;
 
 use models::*;
 use sprite_dicing::{
     Artifacts, DicedSprite, Error, Pivot, Pixel, Prefs, Progress, Rect, SourceSprite, Texture, Uv,
     Vertex,
 };
-use std::ffi::{c_char, CStr, CString};
+use std::ffi::{CStr, CString, c_char};
 use std::mem;
 
 /// C ABI wrapper over [sprite_dicing::dice].
 ///
 /// # Safety
 ///
 /// Returned [CSlice]-governed memory is expected to be de-allocated by the caller.
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn dice(sprites: CSlice<CSourceSprite>, prefs: CPrefs) -> CResult {
     let prefs = to_prefs(prefs);
     let sprites: Vec<_> = to_slice(sprites).iter().map(|s| to_sprite(s)).collect();

crates/abi/src/lib.rs

@@ -1,7 +1,7 @@
 [package]
 name = "cli"
 version = "0.0.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

crates/cli/Cargo.toml

@@ -18,9 +18,9 @@ pub enum Error {
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Error::Dicing(info) => write!(f, "{}", info),
-            Error::Image(err) => write!(f, "{}", err),
-            Error::Io(err) => write!(f, "{}", err),
+            Error::Dicing(info) => write!(f, "{info}"),
+            Error::Image(err) => write!(f, "{err}"),
+            Error::Io(err) => write!(f, "{err}"),
         }
     }
 }

crates/cli/src/models.rs

@@ -1,7 +1,7 @@
 [package]
 name = "sprite_dicing"
 version = "0.1.4"
-edition = "2021"
+edition = "2024"
 description = "Cross-engine tool for lossless compression of sprite textures with identical areas."
 license = "MIT"
 authors = ["Artyom Sovetnikov (Elringus)"]

crates/lib/Cargo.toml

@@ -153,14 +153,18 @@ mod tests {
 
     #[test]
     fn errs_when_unit_size_zero() {
-        assert!(dice(&[src(&R1X1)], &pref(0, 0))
-            .is_err_and(|e| e.to_string() == "Unit size can't be zero."));
+        assert!(
+            dice(&[src(&R1X1)], &pref(0, 0))
+                .is_err_and(|e| e.to_string() == "Unit size can't be zero.")
+        );
     }
 
     #[test]
     fn errs_when_padding_is_above_unit_size() {
-        assert!(dice(&[src(&R1X1)], &pref(1, 2))
-            .is_err_and(|e| e.to_string() == "Padding can't be above unit size."));
+        assert!(
+            dice(&[src(&R1X1)], &pref(1, 2))
+                .is_err_and(|e| e.to_string() == "Padding can't be above unit size.")
+        );
     }
 
     #[test]

crates/lib/src/dicer.rs

@@ -116,8 +116,8 @@ impl AnySource for (&LazyLock<Texture>, (f32, f32)) {
     }
     fn pivot(&self) -> Option<Pivot> {
         Some(Pivot {
-            x: self.1 .0,
-            y: self.1 .1,
+            x: self.1.0,
+            y: self.1.1,
         })
     }
 }

crates/lib/src/fixtures.rs

@@ -15,7 +15,7 @@ pub enum Error {
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Error::Spec(info) => write!(f, "{}", info),
+            Error::Spec(info) => write!(f, "{info}"),
         }
     }
 }

crates/lib/src/models.rs

@@ -1,7 +1,7 @@
 [package]
 name = "tests"
 version = "0.0.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [[test]]
@@ -13,4 +13,4 @@ sprite_dicing = { path = "../lib" }
 cli = { path = "../cli" }
 image = { version = "0.25", default-features = false, features = ["png", "webp"] }
 serde_json = "1.0"
-rand = "0.8"
+rand = "0.9"