From c125ce27aa8cdaec098307eaacd296a7d35fde5b Mon Sep 17 00:00:00 2001 From: turbocool3r Date: Fri, 13 Sep 2024 19:31:13 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8zd:=20Allow=20`zbus`=20attribute=20?= =?UTF-8?q?in=20macros.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed to resolve https://github.com/dbus2/zbus/issues/807. --- zvariant_derive/src/lib.rs | 6 +++--- zvariant_derive/src/utils.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zvariant_derive/src/lib.rs b/zvariant_derive/src/lib.rs index 43e891926..a2f0d9615 100644 --- a/zvariant_derive/src/lib.rs +++ b/zvariant_derive/src/lib.rs @@ -159,7 +159,7 @@ mod value; /// [`Serialize`]: https://docs.serde.rs/serde/trait.Serialize.html /// [`Deserialize`]: https://docs.serde.rs/serde/de/trait.Deserialize.html /// [serde_repr]: https://crates.io/crates/serde_repr -#[proc_macro_derive(Type, attributes(zvariant))] +#[proc_macro_derive(Type, attributes(zbus, zvariant))] pub fn type_macro_derive(input: TokenStream) -> TokenStream { let ast: DeriveInput = syn::parse(input).unwrap(); r#type::expand_derive(ast) @@ -227,7 +227,7 @@ pub fn type_macro_derive(input: TokenStream) -> TokenStream { /// * `"kebab-case"` /// /// [`Serialize`]: https://docs.serde.rs/serde/trait.Serialize.html -#[proc_macro_derive(SerializeDict, attributes(zvariant))] +#[proc_macro_derive(SerializeDict, attributes(zbus, zvariant))] pub fn serialize_dict_macro_derive(input: TokenStream) -> TokenStream { let input: DeriveInput = syn::parse(input).unwrap(); dict::expand_serialize_derive(input) @@ -296,7 +296,7 @@ pub fn serialize_dict_macro_derive(input: TokenStream) -> TokenStream { /// * `"kebab-case"` /// /// [`Deserialize`]: https://docs.serde.rs/serde/de/trait.Deserialize.html -#[proc_macro_derive(DeserializeDict, attributes(zvariant))] +#[proc_macro_derive(DeserializeDict, attributes(zbus, zvariant))] pub fn deserialize_dict_macro_derive(input: TokenStream) -> TokenStream { let input: DeriveInput = syn::parse(input).unwrap(); dict::expand_deserialize_derive(input) diff --git a/zvariant_derive/src/utils.rs b/zvariant_derive/src/utils.rs index 81b6f4e06..6c9c0d8ba 100644 --- a/zvariant_derive/src/utils.rs +++ b/zvariant_derive/src/utils.rs @@ -16,7 +16,7 @@ pub fn zvariant_path() -> TokenStream { } def_attrs! { - crate zvariant; + crate zbus, zvariant; /// Attributes defined on structures. pub StructAttributes("struct") { signature str, rename_all str, deny_unknown_fields none };