chore(deps): upgrade darling to 0.24

Author: rcoh

Cargo.lock

@@ -45,7 +45,7 @@ bit-set = "0.8"
 chrono = "0.4"
 crossbeam-queue = "0.3"
 crossbeam-utils = "0.8"
-darling = "0.23"
+darling = "0.24.1"
 derive-where = "1"
 dtoa = "1"
 enum-map = "2"
@@ -62,7 +62,7 @@ metrics-util_020 = { package = "metrics-util", version = "0.20" }
 ordered-float = "5.1.0"
 papaya = "0.2"
 pin-project = "1"
-prettyplease = "0.2"
+prettyplease = "0.3"
 proc-macro2 = "1.0"
 quote = "1.0"
 rand = "0.9"
@@ -77,9 +77,7 @@ smallvec = "1.13.1"
 str_inflector = "0.12"
 strum_macros = "0.27"
 syn = "3.0"
-# Compatibility boundary for darling and synstructure, which still expose syn 2 AST types.
-syn2 = { package = "syn", version = "2.0" }
-synstructure = "0.13"
+synstructure = "0.14"
 shuttle = "0.9"
 tempfile = "3"
 tokio = { version = "1.38", default-features = false }

Cargo.toml

@@ -13,7 +13,6 @@ proc-macro = true
 
 [dependencies]
 syn = { workspace = true, features = ["full", "extra-traits", "visit-mut"] }
-syn2 = { workspace = true, features = ["full", "extra-traits"] }
 quote = { workspace = true }
 proc-macro2 = { workspace = true }
 Inflector = { workspace = true }

metrique-macro/Cargo.toml

@@ -126,7 +126,7 @@ fn parse_aggregate_fields(input: &DeriveInput) -> Result<ParsedAggregate> {
             .filter(|attr| attr.path().is_ident("metrics"))
             .cloned()
             .collect();
-        let has_unit = crate::RawMetricsFieldAttrs::from_field(&crate::field_to_syn2(field)?)
+        let has_unit = crate::RawMetricsFieldAttrs::from_field(field)
             .ok()
             .and_then(|attrs| attrs.unit)
             .is_some();
@@ -530,7 +530,7 @@ mod tests {
 
     fn aggregate_impl_string(input: Ts2) -> String {
         let output = aggregate_impl(input, false);
-        match syn2::parse2::<syn2::File>(output.clone()) {
+        match syn::parse2::<syn::File>(output.clone()) {
             Ok(file) => prettyplease::unparse(&file),
             Err(_) => output.to_string(),
         }
@@ -603,7 +603,7 @@ mod tests {
         };
 
         let output = aggregate_impl(input, true);
-        let parsed_file = match syn2::parse2::<syn2::File>(output.clone()) {
+        let parsed_file = match syn::parse2::<syn::File>(output.clone()) {
             Ok(file) => prettyplease::unparse(&file),
             Err(_) => output.to_string(),
         };
@@ -622,7 +622,7 @@ mod tests {
         };
 
         let output = aggregate_impl(input, false);
-        let parsed_file = match syn2::parse2::<syn2::File>(output.clone()) {
+        let parsed_file = match syn::parse2::<syn::File>(output.clone()) {
             Ok(file) => prettyplease::unparse(&file),
             Err(_) => output.to_string(),
         };

metrique-macro/src/aggregate.rs

@@ -4,17 +4,17 @@
 use darling::FromMeta;
 use proc_macro2::TokenStream as Ts2;
 use quote::{ToTokens, quote};
-use syn2::{Expr, spanned::Spanned};
+use syn::{Expr, spanned::Spanned};
 
 #[derive(Debug, Clone)]
 pub(crate) struct DimensionSet {
     pub(crate) dimensions: Vec<Expr>,
 }
 
 impl DimensionSet {
-    fn from_expr(expr: &syn2::Expr) -> darling::Result<Self> {
+    fn from_expr(expr: &syn::Expr) -> darling::Result<Self> {
         match expr {
-            syn2::Expr::Array(array) => Ok(DimensionSet {
+            syn::Expr::Array(array) => Ok(DimensionSet {
                 dimensions: array.elems.iter().cloned().collect(),
             }),
             _other => Err(darling::Error::custom(
@@ -31,9 +31,9 @@ pub(crate) struct DimensionSets {
 }
 
 impl FromMeta for DimensionSets {
-    fn from_expr(expr: &syn2::Expr) -> darling::Result<Self> {
+    fn from_expr(expr: &syn::Expr) -> darling::Result<Self> {
         match expr {
-            syn2::Expr::Array(array) => {
+            syn::Expr::Array(array) => {
                 let mut accum = darling::Error::accumulator();
                 let sets = array
                     .elems

metrique-macro/src/emf.rs

@@ -105,8 +105,7 @@ fn parse_variant_data(fields: &syn::Fields) -> MacroResult<Option<VariantData>>
                 .unnamed
                 .iter()
                 .map(|field| -> MacroResult<TupleData> {
-                    let field2 = crate::field_to_syn2(field)?;
-                    let raw_attrs = RawMetricsFieldAttrs::from_field(&field2)?;
+                    let raw_attrs = RawMetricsFieldAttrs::from_field(field)?;
                     let attrs = raw_attrs.validate()?;
 
                     match &attrs.kind {
@@ -203,8 +202,7 @@ pub(crate) fn parse_enum_variants(
         };
 
         let attrs = if mode != VariantMode::SkipAttributeParsing {
-            let variant2 = crate::variant_to_syn2(variant)?;
-            match errors.handle(RawMetricsVariantAttrs::from_variant(&variant2)) {
+            match errors.handle(RawMetricsVariantAttrs::from_variant(variant)) {
                 Some(attrs) => attrs.validate(mode)?,
                 None => {
                     continue;