[2/n] move to the 2024 edition

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 ]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/oxidecomputer/daft"
 rust-version = "1.85.0"
 license = "MIT OR Apache-2.0"

daft-derive/src/internals/imp.rs

@@ -1,11 +1,11 @@
 use super::error_store::{ErrorSink, ErrorStore};
 use proc_macro2::{Span, TokenStream};
-use quote::{quote, quote_spanned, ToTokens};
+use quote::{ToTokens, quote, quote_spanned};
 use syn::{
-    parse_quote, parse_quote_spanned, parse_str, spanned::Spanned,
-    visit::Visit, Attribute, Data, DataStruct, DeriveInput, Expr, Field,
-    Fields, GenericParam, Generics, Index, Lifetime, LifetimeParam, Path,
-    Token, WhereClause, WherePredicate,
+    Attribute, Data, DataStruct, DeriveInput, Expr, Field, Fields,
+    GenericParam, Generics, Index, Lifetime, LifetimeParam, Path, Token,
+    WhereClause, WherePredicate, parse_quote, parse_quote_spanned, parse_str,
+    spanned::Spanned, visit::Visit,
 };
 
 pub struct DeriveDiffableOutput {
@@ -740,11 +740,7 @@ impl StructConfig {
             }
         }
 
-        if errors.has_critical_errors() {
-            None
-        } else {
-            Some(Self { mode })
-        }
+        if errors.has_critical_errors() { None } else { Some(Self { mode }) }
     }
 }
 
@@ -823,11 +819,7 @@ impl FieldConfig {
             }
         }
 
-        if errors.has_critical_errors() {
-            None
-        } else {
-            Some(Self { mode })
-        }
+        if errors.has_critical_errors() { None } else { Some(Self { mode }) }
     }
 }
 

daft-derive/tests/snapshot_test.rs

@@ -1,6 +1,6 @@
 use datatest_stable::Utf8Path;
 use quote::ToTokens;
-use syn::{parse_quote, DeriveInput};
+use syn::{DeriveInput, parse_quote};
 
 // We need access to the proc-macro's internals for this test. An alternative
 // would be to make this a unit test, but the integration test harness gives us

daft/src/core_impls.rs

@@ -6,9 +6,9 @@ use core::{
     marker::PhantomData,
     net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6},
     num::{
-        NonZeroI128, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI8,
-        NonZeroIsize, NonZeroU128, NonZeroU16, NonZeroU32, NonZeroU64,
-        NonZeroU8, NonZeroUsize,
+        NonZeroI8, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI128,
+        NonZeroIsize, NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64,
+        NonZeroU128, NonZeroUsize,
     },
 };
 

rustfmt.toml

@@ -3,4 +3,4 @@
 # ---------------------------------------------------------------------------
 max_width = 80
 use_small_heuristics = "max"
-edition = "2021"
+edition = "2024"