Merge pull request #217 from greyblake/rust2024

Rust edition 2024

Author: greyblake

CHANGELOG.md

@@ -1,3 +1,6 @@
+### v0.x.x - 2025-xx-xx
+- Update Rust edition: 2021 -> 2024
+
 ### v0.6.1 - 2025-02-09
 - **[FIX]** Fix `derive(Deserialize)` for no_std.
 

nutype/Cargo.toml

@@ -2,7 +2,7 @@
 name = "nutype"
 version = "0.6.1"
 authors = ["Serhii Potapov <[email protected]>"]
-edition = "2021"
+edition = "2024"
 description = "The newtype with guarantees."
 keywords = ["newtype", "validation", "sanitization", "derive", "invariant"]
 license = "MIT"

nutype_macros/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "nutype_macros"
 version = "0.6.1"
-edition = "2021"
+edition = "2024"
 authors = ["Serhii Potapov <[email protected]>"]
 description = "The newtype with guarantees."
 keywords = ["newtype", "validation", "sanitization", "derive", "invariant"]

nutype_macros/build.rs

@@ -1,4 +1,4 @@
-use rustc_version::{version, version_meta, Channel};
+use rustc_version::{Channel, version, version_meta};
 
 fn main() {
     let version = version().expect("Couldn't get Rust version");

nutype_macros/src/any/gen/error.rs renamed to nutype_macros/src/any/generate/error.rs

@@ -4,7 +4,7 @@ use quote::quote;
 use crate::{
     any::models::AnyValidator,
     common::{
-        gen::error::gen_impl_error_trait,
+        generate::error::gen_impl_error_trait,
         models::{ErrorTypePath, TypeName},
     },
 };

nutype_macros/src/any/gen/mod.rs renamed to nutype_macros/src/any/generate/mod.rs

@@ -5,20 +5,20 @@ use std::collections::HashSet;
 
 use proc_macro2::TokenStream;
 use quote::quote;
-use syn::{parse_quote, Generics};
+use syn::{Generics, parse_quote};
 
 use crate::common::{
-    gen::{
-        tests::gen_test_should_have_valid_default_value, traits::GeneratedTraits, GenerateNewtype,
+    generate::{
+        GenerateNewtype, tests::gen_test_should_have_valid_default_value, traits::GeneratedTraits,
     },
     models::{ConstFn, ErrorTypePath, Guard, TypeName, TypedCustomFunction},
 };
 
 use self::error::gen_validation_error_type;
 
 use super::{
-    models::{AnyDeriveTrait, AnyGuard, AnyInnerType, AnySanitizer, AnyValidator},
     AnyNewtype,
+    models::{AnyDeriveTrait, AnyGuard, AnyInnerType, AnySanitizer, AnyValidator},
 };
 
 use traits::gen_traits;

nutype_macros/src/any/gen/traits/arbitrary.rs renamed to nutype_macros/src/any/generate/traits/arbitrary.rs

@@ -4,7 +4,7 @@ use syn::Generics;
 
 use crate::{
     any::models::{AnyGuard, AnyInnerType},
-    common::gen::{add_bound_to_all_type_params, add_param, strip_trait_bounds_on_generics},
+    common::generate::{add_bound_to_all_type_params, add_param, strip_trait_bounds_on_generics},
     common::models::TypeName,
 };
 

nutype_macros/src/any/gen/traits/into_iter.rs renamed to nutype_macros/src/any/generate/traits/into_iter.rs

@@ -5,7 +5,7 @@ use syn::Generics;
 use crate::{
     any::models::AnyInnerType,
     common::{
-        gen::{add_param, strip_trait_bounds_on_generics},
+        generate::{add_param, strip_trait_bounds_on_generics},
         models::TypeName,
     },
 };

nutype_macros/src/any/gen/traits/mod.rs renamed to nutype_macros/src/any/generate/traits/mod.rs

@@ -2,19 +2,19 @@ pub mod arbitrary;
 pub mod into_iter;
 
 use proc_macro2::TokenStream;
-use quote::{quote, ToTokens};
+use quote::{ToTokens, quote};
 use std::collections::HashSet;
 
 use crate::{
     any::models::AnyDeriveTrait,
     any::models::{AnyGuard, AnyInnerType},
     common::{
-        gen::traits::{
-            gen_impl_trait_as_ref, gen_impl_trait_borrow, gen_impl_trait_default,
-            gen_impl_trait_deref, gen_impl_trait_display, gen_impl_trait_from,
-            gen_impl_trait_from_str, gen_impl_trait_into, gen_impl_trait_serde_deserialize,
-            gen_impl_trait_serde_serialize, gen_impl_trait_try_from, split_into_generatable_traits,
-            GeneratableTrait, GeneratableTraits, GeneratedTraits,
+        generate::traits::{
+            GeneratableTrait, GeneratableTraits, GeneratedTraits, gen_impl_trait_as_ref,
+            gen_impl_trait_borrow, gen_impl_trait_default, gen_impl_trait_deref,
+            gen_impl_trait_display, gen_impl_trait_from, gen_impl_trait_from_str,
+            gen_impl_trait_into, gen_impl_trait_serde_deserialize, gen_impl_trait_serde_serialize,
+            gen_impl_trait_try_from, split_into_generatable_traits,
         },
         models::TypeName,
     },

nutype_macros/src/any/mod.rs

@@ -1,4 +1,4 @@
-pub mod gen;
+pub mod generate;
 pub mod models;
 pub mod parse;
 pub mod validate;
@@ -7,7 +7,7 @@ use proc_macro2::TokenStream;
 use std::collections::HashSet;
 
 use self::models::{AnyDeriveTrait, AnyGuard, AnyInnerType, AnySanitizer, AnyValidator};
-use crate::common::gen::GenerateNewtype;
+use crate::common::generate::GenerateNewtype;
 use crate::common::models::TypeName;
 use crate::{
     any::validate::validate_any_derive_traits,