diff --git a/Cargo.toml b/Cargo.toml index c5c09a232db..6e13a832a55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ content-security-policy = { version = "0.5", features = ["serde"] } cookie = "0.12" crossbeam-channel = "0.5" cssparser = { version = "0.31", git = "https://github.com/servo/rust-cssparser", rev = "6ce91afdf292c4290118843e7421e146f0a4c48b" } -darling = { version = "0.14", default-features = false } +darling = { version = "0.20", default-features = false } data-url = "0.1.0" devtools_traits = { path = "components/shared/devtools" } embedder_traits = { path = "components/shared/embedder" } diff --git a/components/derive_common/Cargo.toml b/components/derive_common/Cargo.toml index 937e97f81ac..ab358c83b9b 100644 --- a/components/derive_common/Cargo.toml +++ b/components/derive_common/Cargo.toml @@ -13,5 +13,5 @@ path = "lib.rs" darling = { workspace = true } proc-macro2 = { workspace = true } quote = { workspace = true } -syn = { version = "1", default-features = false, features = ["clone-impls", "derive", "parsing"] } -synstructure = "0.12" +syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } +synstructure = "0.13" diff --git a/components/derive_common/cg.rs b/components/derive_common/cg.rs index a2eed8daf6c..26a32ccd89a 100644 --- a/components/derive_common/cg.rs +++ b/components/derive_common/cg.rs @@ -6,7 +6,7 @@ use darling::{FromDeriveInput, FromField, FromVariant}; use proc_macro2::{Span, TokenStream}; use quote::{quote, TokenStreamExt}; use syn::{ - self, parse_quote, AngleBracketedGenericArguments, Binding, DeriveInput, Field, + self, parse_quote, AngleBracketedGenericArguments, AssocType, DeriveInput, Field, GenericArgument, GenericParam, Ident, Path, PathArguments, PathSegment, QSelf, Type, TypeArray, TypeGroup, TypeParam, TypeParen, TypePath, TypeSlice, TypeTuple, Variant, WherePredicate, }; @@ -252,8 +252,8 @@ where &GenericArgument::Type(ref data) => GenericArgument::Type( map_type_params(data, params, self_type, f), ), - &GenericArgument::Binding(ref data) => { - GenericArgument::Binding(Binding { + &GenericArgument::AssocType(ref data) => { + GenericArgument::AssocType(AssocType { ty: map_type_params(&data.ty, params, self_type, f), ..data.clone() }) diff --git a/components/style_derive/Cargo.toml b/components/style_derive/Cargo.toml index 8f8a9ab5add..e240c0f3328 100644 --- a/components/style_derive/Cargo.toml +++ b/components/style_derive/Cargo.toml @@ -15,5 +15,5 @@ darling = { workspace = true, default-features = false } derive_common = { path = "../derive_common" } proc-macro2 = "1" quote = "1" -syn = { version = "1", default-features = false, features = ["clone-impls", "derive", "parsing"] } -synstructure = "0.12" +syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } +synstructure = "0.13" diff --git a/components/to_shmem_derive/Cargo.toml b/components/to_shmem_derive/Cargo.toml index 0825d5b6834..90fdd1cf49b 100644 --- a/components/to_shmem_derive/Cargo.toml +++ b/components/to_shmem_derive/Cargo.toml @@ -15,5 +15,5 @@ darling = { workspace = true } derive_common = { path = "../derive_common" } proc-macro2 = { workspace = true } quote = { workspace = true } -syn = { version = "1", default-features = false, features = ["clone-impls", "derive", "parsing"] } -synstructure = "0.12" +syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } +synstructure = "0.13"