diff options
Diffstat (limited to 'engine-ecs/src/phase.rs')
| -rw-r--r-- | engine-ecs/src/phase.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine-ecs/src/phase.rs b/engine-ecs/src/phase.rs index 78428c4..64c1593 100644 --- a/engine-ecs/src/phase.rs +++ b/engine-ecs/src/phase.rs @@ -1,4 +1,11 @@ use crate::{declare_entity, Component, World}; +#[cfg(debug_assertions)] +use crate::{ + entity::Name as EntityName, + pair::{ChildOf, Pair, Wildcard}, + query::term::With, + Query, +}; #[derive(Debug, Default, Clone, Copy, Component)] pub struct Phase; @@ -35,11 +42,7 @@ pub(crate) struct HasSystem; #[cfg(debug_assertions)] pub(crate) fn check_parents( - phase_query: crate::query::Query<( - crate::pair::Pair<crate::pair::ChildOf, crate::pair::Wildcard>, - Option<&crate::entity::Name>, - crate::query::term::With<Phase>, - )>, + phase_query: Query<(Pair<ChildOf, Wildcard>, Option<&EntityName>, With<Phase>)>, ) { for (child_of, ent_name) in &phase_query { @@ -47,25 +50,22 @@ pub(crate) fn check_parents( tracing::warn!( phase_entity = ent_name .as_ref() - .map(|ent_name| ent_name.name.as_ref()) - .unwrap_or("<unnamed>"), + .map_or("<unnamed>", |ent_name| ent_name.name.as_ref()), "Parent entity of phase entity does not exist" ); continue; }; if !parent_ent.has_component(Phase::id()) { - let parent_ent_name = parent_ent.get::<crate::entity::Name>(); + let parent_ent_name = parent_ent.get::<EntityName>(); tracing::warn!( phase_entity = ent_name .as_ref() - .map(|ent_name| ent_name.name.as_ref()) - .unwrap_or("<unnamed>"), + .map_or("<unnamed>", |ent_name| ent_name.name.as_ref()), parent_entity = parent_ent_name .as_ref() - .map(|parent_ent_name| parent_ent_name.name.as_ref()) - .unwrap_or("<unnamed>"), + .map_or("<unnamed>", |parent_ent_name| parent_ent_name.name.as_ref()), "Parent entity of phase entity is not a phase (missing Phase component)" ); } |