[Merged by Bors] - Convenience method for entity naming

crates/bevy_core/src/lib.rs

@@ -15,7 +15,7 @@ pub mod prelude {
     //! The Bevy Core Prelude.
     #[doc(hidden)]
     pub use crate::{
-        FrameCountPlugin, Name, TaskPoolOptions, TaskPoolPlugin, TypeRegistrationPlugin,
+        DebugName, FrameCountPlugin, Name, TaskPoolOptions, TaskPoolPlugin, TypeRegistrationPlugin,
     };
 }
 

crates/bevy_core/src/name.rs

@@ -1,4 +1,6 @@
-use bevy_ecs::{component::Component, reflect::ReflectComponent};
+use bevy_ecs::{
+    component::Component, entity::Entity, query::WorldQuery, reflect::ReflectComponent,
+};
 use bevy_reflect::Reflect;
 use bevy_reflect::{std_traits::ReflectDefault, FromReflect};
 use bevy_utils::AHasher;
@@ -76,6 +78,25 @@ impl std::fmt::Display for Name {
     }
 }
 
+/// Convenient query for giving a human friendly name to an entity.
+#[derive(WorldQuery)]
+pub struct DebugName {
+    /// A [`Name`] that the entity might have that is displayed if available.
+    pub name: Option<&'static Name>,
+    /// The unique identifier of the entity as a fallback.
+    pub entity: Entity,
+}
+
+impl std::fmt::Debug for DebugName {
+    #[inline(always)]
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self.name {
+            Some(name) => std::fmt::Debug::fmt(&name, f),
+            None => std::fmt::Debug::fmt(&self.entity, f),
+        }
+    }
+}
+
 /* Conversions from strings */
 
 impl From<&str> for Name {