From ede23ca5c1ad8f641135c18c5f1bc3a873ebd797 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 04:11:04 +0000 Subject: [PATCH 1/2] chore(deps): Bump serde_derive_internals from 0.28.0 to 0.29.0 Bumps [serde_derive_internals](https://github.com/serde-rs/serde) from 0.28.0 to 0.29.0. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/commits) --- updated-dependencies: - dependency-name: serde_derive_internals dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- lib/vector-config-macros/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5891d80cb3a1c..90b959d6ad800 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7722,9 +7722,9 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.33", diff --git a/lib/vector-config-macros/Cargo.toml b/lib/vector-config-macros/Cargo.toml index 1b763ac100ea0..70048bb5ffb28 100644 --- a/lib/vector-config-macros/Cargo.toml +++ b/lib/vector-config-macros/Cargo.toml @@ -11,7 +11,7 @@ proc-macro = true 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.28" +serde_derive_internals = "0.29" syn = { version = "2.0", default-features = false, features = ["full", "extra-traits", "visit-mut", "visit"] } vector-config-common = { path = "../vector-config-common" } From 3e5153a491e2fc8e19045cd13929ecec67b245f1 Mon Sep 17 00:00:00 2001 From: Stephen Wakely Date: Thu, 7 Sep 2023 11:41:58 +0100 Subject: [PATCH 2/2] name needs to be a string now Signed-off-by: Stephen Wakely --- lib/vector-config-macros/src/ast/container.rs | 2 +- lib/vector-config-macros/src/ast/field.rs | 2 +- lib/vector-config-macros/src/ast/variant.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/vector-config-macros/src/ast/container.rs b/lib/vector-config-macros/src/ast/container.rs index 28cc12f69a35a..581753fa3205f 100644 --- a/lib/vector-config-macros/src/ast/container.rs +++ b/lib/vector-config-macros/src/ast/container.rs @@ -235,7 +235,7 @@ impl<'a> Container<'a> { } let original = input; - let name = serde.attrs.name().deserialize_name(); + let name = serde.attrs.name().deserialize_name().to_string(); let default_value = get_serde_default_value(&serde.ident, serde.attrs.default()); let container = Container { diff --git a/lib/vector-config-macros/src/ast/field.rs b/lib/vector-config-macros/src/ast/field.rs index d38ce6c95417c..09f2d85a33dc5 100644 --- a/lib/vector-config-macros/src/ast/field.rs +++ b/lib/vector-config-macros/src/ast/field.rs @@ -33,7 +33,7 @@ impl<'a> Field<'a> { ) -> darling::Result> { let original = serde.original; - let name = serde.attrs.name().deserialize_name(); + let name = serde.attrs.name().deserialize_name().to_string(); let default_value = get_serde_default_value(&serde.ty, serde.attrs.default()); Attributes::from_attributes(&original.attrs) diff --git a/lib/vector-config-macros/src/ast/variant.rs b/lib/vector-config-macros/src/ast/variant.rs index 5b54ebc30d18f..0a5b0dedf83bf 100644 --- a/lib/vector-config-macros/src/ast/variant.rs +++ b/lib/vector-config-macros/src/ast/variant.rs @@ -26,7 +26,7 @@ impl<'a> Variant<'a> { is_virtual_newtype: bool, ) -> darling::Result> { let original = serde.original; - let name = serde.attrs.name().deserialize_name(); + let name = serde.attrs.name().deserialize_name().to_string(); let style = serde.style.into(); let is_newtype_wrapper_field = style == Style::Newtype;