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

Fix last_changed() and set_last_changed() for MutUntyped (#7619)

Browse Source 
# Objective

Continuation of #7560.

`MutUntyped::last_changed` and `set_last_changed` do not behave as described in their docs.

## Solution

Fix them using the same approach that was used for `Mut<>` in #7560.
This commit is contained in:
JoJoJet 2023-02-11 18:33:57 +00:00
parent 38766faccb
commit 7eb7896cf5
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/bevy_ecs/src/change_detection.rs
View File

@ -185,10 +185,10 @@ macro_rules! change_detection_mut_impl {
} }
#[inline] #[inline]
fn set_last_changed(&mut self, last_change_tick: u32) { fn set_last_changed(&mut self, last_changed: u32) {
self.ticks self.ticks
.changed .changed
.set_changed(last_change_tick); .set_changed(last_changed);
} }
#[inline] #[inline]
@ -242,9 +242,6 @@ macro_rules! impl_methods {
/// This is useful if you have `&mut /// This is useful if you have `&mut
#[doc = stringify!($name)] #[doc = stringify!($name)]
/// <T>`, but you need a `Mut<T>`. /// <T>`, but you need a `Mut<T>`.
///
/// Note that calling [`DetectChangesMut::set_last_changed`] on the returned value
/// will not affect the original.
pub fn reborrow(&mut self) -> Mut<'_, $target> { pub fn reborrow(&mut self) -> Mut<'_, $target> {
Mut { Mut {
value: self.value, value: self.value,
@ -607,9 +604,6 @@ impl<'a> MutUntyped<'a> {
/// Returns a [`MutUntyped`] with a smaller lifetime. /// Returns a [`MutUntyped`] with a smaller lifetime.
/// This is useful if you have `&mut MutUntyped`, but you need a `MutUntyped`. /// This is useful if you have `&mut MutUntyped`, but you need a `MutUntyped`.
///
/// Note that calling [`DetectChangesMut::set_last_changed`] on the returned value
/// will not affect the original.
#[inline] #[inline]
pub fn reborrow(&mut self) -> MutUntyped { pub fn reborrow(&mut self) -> MutUntyped {
MutUntyped { MutUntyped {
@ -667,7 +661,7 @@ impl<'a> DetectChanges for MutUntyped<'a> {
#[inline] #[inline]
fn last_changed(&self) -> u32 { fn last_changed(&self) -> u32 {
self.ticks.last_change_tick self.ticks.changed.tick
} }
} }
@ -680,8 +674,8 @@ impl<'a> DetectChangesMut for MutUntyped<'a> {
} }
#[inline] #[inline]
fn set_last_changed(&mut self, last_change_tick: u32) { fn set_last_changed(&mut self, last_changed: u32) {
self.ticks.last_change_tick = last_change_tick; self.ticks.changed.set_changed(last_changed);
} }
#[inline] #[inline]