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

Move safe operations out of unsafe blocks in Query (#7851)

Browse Source 
# Objective

Several `Query` methods unnecessarily place the call to `Query::update_archetypes` inside of unsafe blocks.

## Solution

Move the method calls out of the unsafe blocks.
This commit is contained in:
JoJoJet 2023-02-28 17:59:41 +00:00
parent 261905f11d
commit dd7a21703f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/bevy_ecs/src/query/state.rs
View File

@ -502,9 +502,9 @@ impl<Q: WorldQuery, F: ReadOnlyWorldQuery> QueryState<Q, F> {
&'s mut self, &'s mut self,
world: &'w World, world: &'w World,
) -> QueryIter<'w, 's, Q::ReadOnly, F::ReadOnly> { ) -> QueryIter<'w, 's, Q::ReadOnly, F::ReadOnly> {
self.update_archetypes(world);
// SAFETY: query is read only // SAFETY: query is read only
unsafe { unsafe {
self.update_archetypes(world);
self.as_readonly().iter_unchecked_manual( self.as_readonly().iter_unchecked_manual(
world, world,
world.last_change_tick(), world.last_change_tick(),
@ -517,11 +517,9 @@ impl<Q: WorldQuery, F: ReadOnlyWorldQuery> QueryState<Q, F> {
#[inline] #[inline]
pub fn iter_mut<'w, 's>(&'s mut self, world: &'w mut World) -> QueryIter<'w, 's, Q, F> { pub fn iter_mut<'w, 's>(&'s mut self, world: &'w mut World) -> QueryIter<'w, 's, Q, F> {
let change_tick = world.change_tick(); let change_tick = world.change_tick();
self.update_archetypes(world);
// SAFETY: query has unique world access // SAFETY: query has unique world access
unsafe { unsafe { self.iter_unchecked_manual(world, world.last_change_tick(), change_tick) }
self.update_archetypes(world);
self.iter_unchecked_manual(world, world.last_change_tick(), change_tick)
}
} }
/// Returns an [`Iterator`] over the query results for the given [`World`] without updating the query's archetypes. /// Returns an [`Iterator`] over the query results for the given [`World`] without updating the query's archetypes.
@ -570,9 +568,9 @@ impl<Q: WorldQuery, F: ReadOnlyWorldQuery> QueryState<Q, F> {
&'s mut self, &'s mut self,
world: &'w World, world: &'w World,
) -> QueryCombinationIter<'w, 's, Q::ReadOnly, F::ReadOnly, K> { ) -> QueryCombinationIter<'w, 's, Q::ReadOnly, F::ReadOnly, K> {
self.update_archetypes(world);
// SAFETY: query is read only // SAFETY: query is read only
unsafe { unsafe {
self.update_archetypes(world);
self.as_readonly().iter_combinations_unchecked_manual( self.as_readonly().iter_combinations_unchecked_manual(
world, world,
world.last_change_tick(), world.last_change_tick(),
@ -604,9 +602,9 @@ impl<Q: WorldQuery, F: ReadOnlyWorldQuery> QueryState<Q, F> {
world: &'w mut World, world: &'w mut World,
) -> QueryCombinationIter<'w, 's, Q, F, K> { ) -> QueryCombinationIter<'w, 's, Q, F, K> {
let change_tick = world.change_tick(); let change_tick = world.change_tick();
self.update_archetypes(world);
// SAFETY: query has unique world access // SAFETY: query has unique world access
unsafe { unsafe {
self.update_archetypes(world);
self.iter_combinations_unchecked_manual(world, world.last_change_tick(), change_tick) self.iter_combinations_unchecked_manual(world, world.last_change_tick(), change_tick)
} }
} }
@ -766,9 +764,9 @@ impl<Q: WorldQuery, F: ReadOnlyWorldQuery> QueryState<Q, F> {
/// This can only be called for read-only queries, see [`Self::for_each_mut`] for write-queries. /// This can only be called for read-only queries, see [`Self::for_each_mut`] for write-queries.
#[inline] #[inline]
pub fn for_each<'w, FN: FnMut(ROQueryItem<'w, Q>)>(&mut self, world: &'w World, func: FN) { pub fn for_each<'w, FN: FnMut(ROQueryItem<'w, Q>)>(&mut self, world: &'w World, func: FN) {
self.update_archetypes(world);
// SAFETY: query is read only // SAFETY: query is read only
unsafe { unsafe {
self.update_archetypes(world);
self.as_readonly().for_each_unchecked_manual( self.as_readonly().for_each_unchecked_manual(
world, world,
func, func,
@ -783,9 +781,9 @@ impl<Q: WorldQuery, F: ReadOnlyWorldQuery> QueryState<Q, F> {
#[inline] #[inline]
pub fn for_each_mut<'w, FN: FnMut(Q::Item<'w>)>(&mut self, world: &'w mut World, func: FN) { pub fn for_each_mut<'w, FN: FnMut(Q::Item<'w>)>(&mut self, world: &'w mut World, func: FN) {
let change_tick = world.change_tick(); let change_tick = world.change_tick();
self.update_archetypes(world);
// SAFETY: query has unique world access // SAFETY: query has unique world access
unsafe { unsafe {
self.update_archetypes(world);
self.for_each_unchecked_manual(world, func, world.last_change_tick(), change_tick); self.for_each_unchecked_manual(world, func, world.last_change_tick(), change_tick);
} }
} }