forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow deriving bundle for struct with generics with where clause (#1811)

Browse Source 
fixes #1777 

Seems the `_where_clause` parameter to lost somewhere, adding it back
This commit is contained in:
François 2021-04-03 23:30:30 +00:00
parent 9098df3034
commit 3e285d5c0b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_ecs/macros/src/lib.rs
View File

@ -141,12 +141,12 @@ pub fn derive_bundle(input: TokenStream) -> TokenStream {
} }
let field_len = field.len(); let field_len = field.len();
let generics = ast.generics; 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; let struct_name = &ast.ident;
TokenStream::from(quote! { TokenStream::from(quote! {
/// SAFE: TypeInfo is returned in field-definition-order. [from_components] and [get_components] use field-definition-order /// 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> { fn type_info() -> Vec<#ecs_path::component::TypeInfo> {
let mut type_info = Vec::with_capacity(#field_len); let mut type_info = Vec::with_capacity(#field_len);
#(#field_type_infos)* #(#field_type_infos)*