Skip to content

Commit

Permalink
Fix Entity hygiene in WorldQuery (#6614)
Browse files Browse the repository at this point in the history
# Objective

Fix #6593

## Solution

Fully qualify `Entity` in the `WorldQuery` macro
  • Loading branch information
nicopap committed Nov 14, 2022
1 parent 7231e00 commit 1967c3d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions crates/bevy_ecs/macros/src/fetch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream {
#[inline(always)]
unsafe fn fetch<'__w>(
_fetch: &mut <Self as #path::query::WorldQuery>::Fetch<'__w>,
_entity: Entity,
_entity: #path::entity::Entity,
_table_row: usize
) -> <Self as #path::query::WorldQuery>::Item<'__w> {
Self::Item {
Expand All @@ -295,7 +295,7 @@ pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream {
#[inline(always)]
unsafe fn filter_fetch<'__w>(
_fetch: &mut <Self as #path::query::WorldQuery>::Fetch<'__w>,
_entity: Entity,
_entity: #path::entity::Entity,
_table_row: usize
) -> bool {
true #(&& <#field_types>::filter_fetch(&mut _fetch.#field_idents, _entity, _table_row))*
Expand Down

0 comments on commit 1967c3d

Please sign in to comment.