Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - Add entity ID to expect() message #2943

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - Add entity ID to expect() message #2943

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
796628b
Add entity ID to expect() message
djeedai Oct 9, 2021
40b202e
Remove allocation on non-failure case
djeedai Oct 9, 2021
e5827a6
Fix typo
djeedai Oct 9, 2021
be5e08a
Use {:?} instead of custom format
djeedai Oct 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions crates/bevy_ecs/src/world/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,14 @@ impl World {
/// ```
#[inline]
pub fn entity(&self, entity: Entity) -> EntityRef {
self.get_entity(entity).expect("Entity does not exist")
// Lazily evaluate panic!() via unwrap_or_else() to avoid allocation unless failure
self.get_entity(entity).unwrap_or_else(|| {
panic!(
"Entity #{} does not exist (generation #{})",
djeedai marked this conversation as resolved.
Show resolved Hide resolved
entity.id(),
entity.generation()
)
})
}

/// Retrieves an [EntityMut] that exposes read and write operations for the given `entity`.
Expand All @@ -207,11 +214,18 @@ impl World {
/// .id();
///
/// let mut position = world.entity_mut(entity).get_mut::<Position>().unwrap();
/// position.x = 1.0;
/// position.x = 1.0;F
djeedai marked this conversation as resolved.
Show resolved Hide resolved
/// ```
#[inline]
pub fn entity_mut(&mut self, entity: Entity) -> EntityMut {
self.get_entity_mut(entity).expect("Entity does not exist")
// Lazily evaluate panic!() via unwrap_or_else() to avoid allocation unless failure
self.get_entity_mut(entity).unwrap_or_else(|| {
panic!(
"Entity #{} does not exist (generation #{})",
entity.id(),
entity.generation()
)
})
}

/// Retrieves an [EntityRef] that exposes read-only operations for the given `entity`.
Expand Down