From 763b01fd3f35842d1bc065ad27e5a6a6d4265cef Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Tue, 21 Jul 2026 15:16:47 +0200
Subject: refactor(engine-ecs): remove old declare_entity macro rule

---
 engine-ecs/examples/event_loop.rs | 41 +++++++--------------------------------
 engine-ecs/examples/with_sole.rs  | 17 +++++-----------
 engine-ecs/src/entity.rs          |  7 -------
 3 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/engine-ecs/examples/event_loop.rs b/engine-ecs/examples/event_loop.rs
index 5202788..7e215bd 100644
--- a/engine-ecs/examples/event_loop.rs
+++ b/engine-ecs/examples/event_loop.rs
@@ -1,7 +1,7 @@
 use engine_ecs::actions::Actions;
-use engine_ecs::pair::{ChildOf, Pair};
+use engine_ecs::pair::ChildOf;
 use engine_ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
-use engine_ecs::{declare_entity, Component, Query, World};
+use engine_ecs::{declare_entity, pair, Component, Query, World};
 
 #[derive(Component)]
 struct Wool
@@ -65,38 +65,11 @@ fn age(query: Query<(&mut Health, &Name)>, mut actions: Actions)
     }
 }
 
-declare_entity!(
-    SHEER_PHASE,
-    (
-        Phase,
-        Pair::builder()
-            .relation::<ChildOf>()
-            .target_id(*UPDATE_PHASE)
-            .build()
-    )
-);
-
-declare_entity!(
-    FEED_PHASE,
-    (
-        Phase,
-        Pair::builder()
-            .relation::<ChildOf>()
-            .target_id(*SHEER_PHASE)
-            .build()
-    )
-);
-
-declare_entity!(
-    AGE_PHASE,
-    (
-        Phase,
-        Pair::builder()
-            .relation::<ChildOf>()
-            .target_id(*FEED_PHASE)
-            .build()
-    )
-);
+declare_entity! {
+    SHEER_PHASE: (Phase, pair!(ChildOf, { *UPDATE_PHASE }));
+    FEED_PHASE: (Phase, pair!(ChildOf, { *SHEER_PHASE }));
+    AGE_PHASE: (Phase, pair!(ChildOf, { *FEED_PHASE }));
+}
 
 fn main()
 {
diff --git a/engine-ecs/examples/with_sole.rs b/engine-ecs/examples/with_sole.rs
index 16a5aba..69670d1 100644
--- a/engine-ecs/examples/with_sole.rs
+++ b/engine-ecs/examples/with_sole.rs
@@ -1,7 +1,7 @@
-use engine_ecs::pair::{ChildOf, Pair};
+use engine_ecs::pair::ChildOf;
 use engine_ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
 use engine_ecs::sole::Single;
-use engine_ecs::{declare_entity, Component, Query, Sole, World};
+use engine_ecs::{declare_entity, pair, Component, Query, Sole, World};
 
 #[derive(Component)]
 struct Ammo
@@ -33,16 +33,9 @@ fn print_total_ammo_count(ammo_counter: Single<AmmoCounter>)
     assert_eq!(ammo_count, 19);
 }
 
-declare_entity!(
-    PRINT_AMMO_COUNT_PHASE,
-    (
-        Phase,
-        Pair::builder()
-            .relation::<ChildOf>()
-            .target_id(*UPDATE_PHASE)
-            .build()
-    )
-);
+declare_entity! {
+    PRINT_AMMO_COUNT_PHASE: (Phase, pair!(ChildOf, { *UPDATE_PHASE }));
+}
 
 fn main()
 {
diff --git a/engine-ecs/src/entity.rs b/engine-ecs/src/entity.rs
index db59301..4e0ca52 100644
--- a/engine-ecs/src/entity.rs
+++ b/engine-ecs/src/entity.rs
@@ -317,13 +317,6 @@ impl Deref for Declaration
 #[allow(clippy::module_name_repetitions)]
 #[macro_export]
 macro_rules! declare_entity {
-    ($visibility: vis $ident: ident, $components: expr) => {
-        $visibility static $ident: $crate::entity::Declaration =
-            $crate::entity::Declaration::new(|world| {
-                world.spawn_with_uid(*$ident, $components);
-            });
-    };
-
     ($($(#[$attr: meta])* $visibility: vis $ident: ident: $components: expr;)+) => {
         $(
             $(#[$attr])*
-- 
cgit v1.2.3-18-g5258