From ea9c7d58ffd5bd196406d72a9331ca30188b1137 Mon Sep 17 00:00:00 2001 From: TheRawMeatball Date: Tue, 9 Mar 2021 03:49:48 +0000 Subject: [PATCH] Fix label macro for types with generics (#1498) Fixes #1497 Co-authored-by: Carter Anderson --- crates/bevy_ecs/macros/src/lib.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/crates/bevy_ecs/macros/src/lib.rs b/crates/bevy_ecs/macros/src/lib.rs index 588b8df37f..9b4ccbfc2b 100644 --- a/crates/bevy_ecs/macros/src/lib.rs +++ b/crates/bevy_ecs/macros/src/lib.rs @@ -415,6 +415,7 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream { #[proc_macro_derive(SystemLabel)] pub fn derive_system_label(input: TokenStream) -> TokenStream { let input = parse_macro_input!(input as DeriveInput); + derive_label(input, Ident::new("SystemLabel", Span::call_site())).into() } @@ -434,8 +435,15 @@ fn derive_label(input: DeriveInput, label_type: Ident) -> TokenStream2 { let ident = input.ident; let ecs_path: Path = bevy_ecs_path(); + let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl(); + let mut where_clause = where_clause.cloned().unwrap_or_else(|| syn::WhereClause { + where_token: Default::default(), + predicates: Default::default(), + }); + where_clause.predicates.push(syn::parse2(quote! { Self: Eq + ::std::fmt::Debug + ::std::hash::Hash + Clone + Send + Sync + 'static }).unwrap()); + quote! { - impl #ecs_path::schedule::#label_type for #ident { + impl #impl_generics #ecs_path::schedule::#label_type for #ident #ty_generics #where_clause { fn dyn_clone(&self) -> Box { Box::new(Clone::clone(self)) }