fix missing paths in ECS SystemParam derive macro v2

Originally authored by @woubuc
bevyengine · Jul 26, 2021 · 0472baa · 0472baa
1 parent 97d8e4e
commit 0472baa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/crates/bevy_ecs/macros/src/lib.rs b/crates/bevy_ecs/macros/src/lib.rs
@@ -376,7 +376,7 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream {
 
  TokenStream::from(quote! {
  impl #impl_generics #path::system::SystemParam for #struct_name#ty_generics #where_clause {
- type Fetch = #fetch_struct_name <(#(<#field_types as SystemParam>::Fetch,)*), #punctuated_generic_idents>;
+ type Fetch = #fetch_struct_name <(#(<#field_types as #path::system::SystemParam>::Fetch,)*), #punctuated_generic_idents>;
  }
 
  pub struct #fetch_struct_name<TSystemParamState, #punctuated_generic_idents> {
@@ -402,7 +402,7 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream {
  }
  }
 
- impl #impl_generics #path::system::SystemParamFetch<'a> for #fetch_struct_name <(#(<#field_types as SystemParam>::Fetch,)*), #punctuated_generic_idents> {
+ impl #impl_generics #path::system::SystemParamFetch<'a> for #fetch_struct_name <(#(<#field_types as #path::system::SystemParam>::Fetch,)*), #punctuated_generic_idents> {
  type Item = #struct_name#ty_generics;
  unsafe fn get_param(
  state: &'a mut Self,
@@ -411,7 +411,7 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream {
  change_tick: u32,
  ) -> Self::Item {
  #struct_name {
- #(#fields: <<#field_types as SystemParam>::Fetch as #path::system::SystemParamFetch>::get_param(&mut state.state.#field_indices, system_state, world, change_tick),)*
+ #(#fields: <<#field_types as #path::system::SystemParam>::Fetch as #path::system::SystemParamFetch>::get_param(&mut state.state.#field_indices, system_state, world, change_tick),)*
  #(#ignored_fields: <#ignored_field_types>::default(),)*
  }
  }