From 3e285d5c0bd49cf1aff11cf3848270bafdd48646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sat, 3 Apr 2021 23:30:30 +0000 Subject: [PATCH] allow deriving bundle for struct with generics with where clause (#1811) fixes #1777 Seems the `_where_clause` parameter to lost somewhere, adding it back --- crates/bevy_ecs/macros/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/bevy_ecs/macros/src/lib.rs b/crates/bevy_ecs/macros/src/lib.rs index 6834040014..8d7995c1d8 100644 --- a/crates/bevy_ecs/macros/src/lib.rs +++ b/crates/bevy_ecs/macros/src/lib.rs @@ -141,12 +141,12 @@ pub fn derive_bundle(input: TokenStream) -> TokenStream { } let field_len = field.len(); let generics = ast.generics; - let (impl_generics, ty_generics, _where_clause) = generics.split_for_impl(); + let (impl_generics, ty_generics, where_clause) = generics.split_for_impl(); let struct_name = &ast.ident; TokenStream::from(quote! { /// SAFE: TypeInfo is returned in field-definition-order. [from_components] and [get_components] use field-definition-order - unsafe impl #impl_generics #ecs_path::bundle::Bundle for #struct_name#ty_generics { + unsafe impl #impl_generics #ecs_path::bundle::Bundle for #struct_name#ty_generics #where_clause { fn type_info() -> Vec<#ecs_path::component::TypeInfo> { let mut type_info = Vec::with_capacity(#field_len); #(#field_type_infos)*