refactor(engine-ecs): remove old declare_entity macro rule

2 files changed, 12 insertions, 46 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()
 {