chore(deps): Bump to syn 2, serde_with 3, darling 0.20, and serde_der…

…ive_internals 0.28 (vectordotdev#17930)

Cargo.toml

@@ -198,7 +198,7 @@ serde = { version = "1.0.168", default-features = false, features = ["derive"] }
 serde-toml-merge = { version = "0.3.0", default-features = false }
 serde_bytes = { version = "0.11.11", default-features = false, features = ["std"], optional = true }
 serde_json = { version = "1.0.100", default-features = false, features = ["raw_value"] }
-serde_with = { version = "2.3.2", default-features = false, features = ["macros", "std"] }
+serde_with = { version = "3.0.0", default-features = false, features = ["macros", "std"] }
 serde_yaml = { version = "0.9.22", default-features = false }
 
 # Messagepack

lib/vector-config-common/Cargo.toml

@@ -6,11 +6,11 @@ license = "MPL-2.0"
 
 [dependencies]
 convert_case = { version = "0.6", default-features = false }
-darling = { version = "0.13", default-features = false, features = ["suggestions"] }
+darling = { version = "0.20", default-features = false, features = ["suggestions"] }
 once_cell = { version = "1", default-features = false, features = ["std"] }
 proc-macro2 = { version = "1.0", default-features = false }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, features = ["std"] }
-syn = { version = "1.0", features = ["full", "extra-traits", "visit-mut", "visit"] }
+syn = { version = "2.0", features = ["full", "extra-traits", "visit-mut", "visit"] }
 tracing = { version = "0.1.34", default-features = false }
 quote = { version = "1.0", default-features = false }

lib/vector-config-common/src/validation.rs

@@ -1,7 +1,7 @@
 use darling::FromMeta;
 use proc_macro2::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{Lit, Meta};
+use syn::{Expr, Lit, Meta};
 
 use crate::{
     num::{ERR_NUMERIC_OUT_OF_RANGE, NUMERIC_ENFORCED_LOWER_BOUND, NUMERIC_ENFORCED_UPPER_BOUND},
@@ -336,17 +336,19 @@ fn maybe_float_or_int(meta: &Meta) -> darling::Result<Option<f64>> {
     // First make sure we can even get a valid f64 from this meta item.
     let result = match meta {
         Meta::Path(_) => Err(darling::Error::unexpected_type("path")),
-        Meta::List(_) => Err(darling::Error::unexpected_type("path")),
-        Meta::NameValue(nv) => match &nv.lit {
-            Lit::Str(s) => {
-                let s = s.value();
-                s.as_str()
-                    .parse()
-                    .map_err(|_| darling::Error::unknown_value(s.as_str()))
-            }
-            Lit::Int(i) => i.base10_parse::<f64>().map_err(Into::into),
-            Lit::Float(f) => f.base10_parse::<f64>().map_err(Into::into),
-            lit => Err(darling::Error::unexpected_lit_type(lit)),
+        Meta::List(_) => Err(darling::Error::unexpected_type("list")),
+        Meta::NameValue(nv) => match &nv.value {
+            Expr::Lit(expr) => match &expr.lit {
+                Lit::Str(s) => {
+                    let s = s.value();
+                    s.parse()
+                        .map_err(|_| darling::Error::unknown_value(s.as_str()))
+                }
+                Lit::Int(i) => i.base10_parse::<f64>().map_err(Into::into),
+                Lit::Float(f) => f.base10_parse::<f64>().map_err(Into::into),
+                lit => Err(darling::Error::unexpected_lit_type(lit)),
+            },
+            expr => Err(darling::Error::unexpected_expr_type(expr)),
         },
     };
 

lib/vector-config-macros/Cargo.toml

@@ -8,11 +8,11 @@ license = "MPL-2.0"
 proc-macro = true
 
 [dependencies]
-darling = { version = "0.13", default-features = false, features = ["suggestions"] }
+darling = { version = "0.20", default-features = false, features = ["suggestions"] }
 proc-macro2 = { version = "1.0", default-features = false }
 quote = { version = "1.0", default-features = false }
-serde_derive_internals = "0.26"
-syn = { version = "1.0", default-features = false, features = ["full", "extra-traits", "visit-mut", "visit"] }
+serde_derive_internals = "0.28"
+syn = { version = "2.0", default-features = false, features = ["full", "extra-traits", "visit-mut", "visit"] }
 vector-config-common = { path = "../vector-config-common" }
 
 [dev-dependencies]

lib/vector-config-macros/src/ast/container.rs

@@ -368,7 +368,7 @@ impl<'a> Container<'a> {
     /// standard `#[deprecated]` attribute, neither automatically applying it nor deriving the
     /// deprecation status of a field when it is present.
     pub fn deprecated(&self) -> bool {
-        self.attrs.deprecated.is_some()
+        self.attrs.deprecated.is_present()
     }
 
     /// Metadata (custom attributes) for the container, if any.
@@ -584,7 +584,7 @@ mod tests {
         assert_eq!(literals_to_idents(&["T"]), idents);
 
         // We don't support parenthesized type parameters, like when using a function pointer type.
-        let parenthesized_type: Type = parse_quote! { Something<Fn(bool) -> String> };
+        let parenthesized_type: Type = parse_quote! { Something<fn(bool) -> String> };
         let idents = get_generic_type_param_idents(&parenthesized_type);
         assert_eq!(None, idents);
     }

lib/vector-config-macros/src/ast/field.rs

@@ -2,9 +2,10 @@ use darling::{
     util::{Flag, Override, SpannedValue},
     FromAttributes,
 };
-use proc_macro2::Span;
+use proc_macro2::{Span, TokenStream};
+use quote::ToTokens;
 use serde_derive_internals::ast as serde_ast;
-use syn::{parse_quote, spanned::Spanned, ExprPath, Ident};
+use syn::{parse_quote, ExprPath, Ident};
 use vector_config_common::validation::Validation;
 
 use super::{
@@ -174,7 +175,7 @@ impl<'a> Field<'a> {
     /// variants, to simply document themselves at the container/variant level and avoid needing to
     /// document that inner field which itself needs no further title/description.
     pub fn transparent(&self) -> bool {
-        self.attrs.transparent.is_some()
+        self.attrs.transparent.is_present()
     }
 
     /// Whether or not the field is deprecated.
@@ -239,12 +240,9 @@ impl<'a> Field<'a> {
     }
 }
 
-impl<'a> Spanned for Field<'a> {
-    fn span(&self) -> proc_macro2::Span {
-        match self.original.ident.as_ref() {
-            Some(ident) => ident.span(),
-            None => self.original.ty.span(),
-        }
+impl<'a> ToTokens for Field<'a> {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        self.original.to_tokens(tokens)
     }
 }
 
@@ -300,12 +298,12 @@ impl Attributes {
             // to throw an error if they are. As we're going to forcefully mark the field as
             // transparent, there's no reason to allow setting derived/transparent manually, as it
             // only leads to boilerplate and potential confusion.
-            if self.transparent.is_some() {
-                return Err(err_field_implicit_transparent(&self.transparent));
+            if self.transparent.is_present() {
+                return Err(err_field_implicit_transparent(&self.transparent.span()));
             }
 
-            if self.derived.is_some() {
-                return Err(err_field_implicit_transparent(&self.derived));
+            if self.derived.is_present() {
+                return Err(err_field_implicit_transparent(&self.derived.span()));
             }
 
             self.transparent = SpannedValue::new(Flag::present(), Span::call_site());
@@ -339,8 +337,8 @@ impl Attributes {
         // like a field that is flattened or not visible, it makes no sense to require a description or title for fields
         // in a virtual newtype.
         if self.description.is_none()
-            && !self.derived.is_some()
-            && !self.transparent.is_some()
+            && !self.derived.is_present()
+            && !self.transparent.is_present()
             && self.visible
             && !self.flatten
             && !is_virtual_newtype