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

lifetime related cleanup in entity_ref.rs (#5611)

Browse Source 
# Objective

EntityMut::world takes &mut self instead of &self I don't see any reason for this.
EntityRef is overly restrictive with fn world and could return &'w World

---

## Changelog

- EntityRef now implements Copy and Clone
- EntityRef::world is now fn(&self) -> &'w World instead of fn(&mut self) -> &World
- EntityMut::world is now fn(&self) -> &World instead of fn(&mut self) -> &World
This commit is contained in:
Boxy 2022-09-12 04:34:52 +00:00
parent 05afbc6815
commit 404b4fc0eb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/bevy_ecs/src/world/entity_ref.rs
View File

@ -11,6 +11,7 @@ use bevy_ptr::{OwningPtr, Ptr, UnsafeCellDeref};
use std::{any::TypeId, cell::UnsafeCell}; use std::{any::TypeId, cell::UnsafeCell};
/// A read-only reference to a particular [`Entity`] and all of its components /// A read-only reference to a particular [`Entity`] and all of its components
#[derive(Copy, Clone)]
pub struct EntityRef<'w> { pub struct EntityRef<'w> {
world: &'w World, world: &'w World,
entity: Entity, entity: Entity,
@ -44,7 +45,7 @@ impl<'w> EntityRef<'w> {
} }
#[inline] #[inline]
pub fn world(&mut self) -> &World { pub fn world(&self) -> &'w World {
self.world self.world
} }
@ -497,7 +498,7 @@ impl<'w> EntityMut<'w> {
} }
#[inline] #[inline]
pub fn world(&mut self) -> &World { pub fn world(&self) -> &World {
self.world self.world
} }