build!: Rust 2024 edition

Author: Pscheidl

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-
+resolver = "3"
 members = ["enum-collections", "enum-collections-macros"]

enum-collections-macros/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "enum-collections-macros"
-version = "1.0.1"
-edition = "2021"
+version = "2.0.0"
+edition = "2024"
 
-description = "Macros to make EnumCollections easy to use"
+description = "Macros for the enum-collections EnumMap"
 authors = ["Pavel Pscheidl <pavel2@pscheidl.cz>"]
 readme = "README.md"
 repository = "https://github.com/Pscheidl/enum-collections"
@@ -21,6 +21,6 @@ default = []
 variants = []
 
 [dependencies]
-syn = "1.0"
+syn = "2.0"
 quote = "1.0"
 proc-macro2 = "1.0"

enum-collections-macros/src/lib.rs

@@ -1,6 +1,6 @@
 use proc_macro::TokenStream;
 use quote::{quote, quote_spanned};
-use syn::{parse_macro_input, spanned::Spanned, DeriveInput};
+use syn::{DeriveInput, parse_macro_input, spanned::Spanned};
 
 /// Creates `enum_map::Enumerated` implementation for the underlying Enum.
 /// Also derives Copy and Clone.

enum-collections/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "enum-collections"
-version = "1.8.0"
-edition = "2021"
+version = "2.0.0"
+edition = "2024"
 
 description = "EnumMap implemented in safe rust"
 authors = ["Pavel Pscheidl <pavel2@pscheidl.cz>"]
@@ -26,7 +26,7 @@ ext = []
 serde = ["variants", "dep:serde"]
 
 [dependencies]
-enum-collections-macros = { path = "../enum-collections-macros", version = "1.0.1" }
+enum-collections-macros = { path = "../enum-collections-macros", version = "2.0.0" }
 serde = { version = "1.0", optional = true }
 
 [dev-dependencies]

enum-collections/benches/enummap.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, hash::Hash};
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use enum_collections::{EnumMap, Enumerated};
 
 #[derive(Enumerated, Eq, PartialEq, Hash)] // Enum derived to benchmark against the `enum-map` crate

enum-collections/src/enummap.rs

@@ -385,7 +385,9 @@ impl<K: Enumerated, V, const N: usize> EnumMap<K, V, N> {
     ///
     /// ```
     #[cfg(feature = "variants")]
-    pub fn iter_kv_mut(&mut self) -> std::iter::Zip<std::slice::Iter<'_, K>, std::slice::IterMut<'_, V>> {
+    pub fn iter_kv_mut(
+        &mut self,
+    ) -> std::iter::Zip<std::slice::Iter<'_, K>, std::slice::IterMut<'_, V>> {
         K::VARIANTS.iter().zip(self.data.iter_mut())
     }
 
@@ -660,8 +662,8 @@ impl<K: Enumerated, V: Copy, const N: usize> Copy for EnumMap<K, V, N> {}
 
 #[cfg(test)]
 mod tests {
-    use crate::enummap::EnumMap;
     use crate::Enumerated;
+    use crate::enummap::EnumMap;
     /// No Debug derived on purpose, the crate must be usable without [std::fmt::Debug] derived
     /// for the enum.
     #[derive(Enumerated, Debug)]

enum-collections/src/ext.rs

@@ -13,7 +13,7 @@ impl Enumerated for bool {
 
 #[cfg(test)]
 mod tests {
-    use crate::{em_default, EnumMap, Enumerated};
+    use crate::{EnumMap, Enumerated, em_default};
 
     #[test]
     fn test_bool() {

enum-collections/src/serde.rs

@@ -1,4 +1,4 @@
-use serde::{de::Visitor, Deserialize, Serialize};
+use serde::{Deserialize, Serialize, de::Visitor};
 use std::{any::type_name, marker::PhantomData};
 
 use crate::{EnumMap, Enumerated};
@@ -23,11 +23,11 @@ struct EnumMapVisitor<
 }
 
 impl<
-        'de,
-        K: Enumerated + Deserialize<'de> + PartialEq,
-        V: Deserialize<'de> + Default,
-        const N: usize,
-    > Visitor<'de> for EnumMapVisitor<'de, K, V, N>
+    'de,
+    K: Enumerated + Deserialize<'de> + PartialEq,
+    V: Deserialize<'de> + Default,
+    const N: usize,
+> Visitor<'de> for EnumMapVisitor<'de, K, V, N>
 {
     type Value = EnumMap<K, V, N>;
 
@@ -57,11 +57,11 @@ impl<
 }
 
 impl<
-        'de,
-        K: Enumerated + Deserialize<'de> + PartialEq,
-        V: Deserialize<'de> + Default + 'de,
-        const N: usize,
-    > Deserialize<'de> for EnumMap<K, V, N>
+    'de,
+    K: Enumerated + Deserialize<'de> + PartialEq,
+    V: Deserialize<'de> + Default + 'de,
+    const N: usize,
+> Deserialize<'de> for EnumMap<K, V, N>
 {
     #[inline]
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>