From cbed21f5e6cfb449d49087cedc867c8e50721ba9 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Wed, 24 Sep 2025 22:16:50 +0200
Subject: refactor(ecs): replace Pair ctor functions with builder

---
 ecs/src/lib.rs | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

(limited to 'ecs/src/lib.rs')

diff --git a/ecs/src/lib.rs b/ecs/src/lib.rs
index 8ce2e7b..fa5a352 100644
--- a/ecs/src/lib.rs
+++ b/ecs/src/lib.rs
@@ -168,7 +168,10 @@ impl World
 
         let system_ent_id = self.create_entity((
             SystemComponent { system: type_erased_system },
-            Pair::new::<DependsOn>(phase_euid),
+            Pair::builder()
+                .relation::<DependsOn>()
+                .target_id(phase_euid)
+                .build(),
         ));
 
         system_callbacks.on_created(self, SystemMetadata { ent_id: system_ent_id });
@@ -344,7 +347,11 @@ impl World
                 QueryTerms::<QUERY_MAX_TERM_CNT>::builder()
                     .with_required([
                         SystemComponent::id(),
-                        Pair::new::<DependsOn>(phase_euid).id(),
+                        Pair::builder()
+                            .relation::<DependsOn>()
+                            .target_id(phase_euid)
+                            .build()
+                            .id(),
                     ])
                     .build(),
             ),
@@ -366,7 +373,11 @@ impl World
             QueryTerms::<2>::builder()
                 .with_required([
                     Phase::id(),
-                    Pair::new::<ChildOf>(parent_phase_euid).id(),
+                    Pair::builder()
+                        .relation::<ChildOf>()
+                        .target_id(parent_phase_euid)
+                        .build()
+                        .id(),
                 ])
                 .build(),
         );
@@ -461,8 +472,13 @@ impl World
                             continue;
                         }
 
-                        event_submitter
-                            .submit_event(&Pair::new::<Removed>(comp_id), entity_uid);
+                        event_submitter.submit_event(
+                            &Pair::builder()
+                                .relation::<Removed>()
+                                .target_id(comp_id)
+                                .build(),
+                            entity_uid,
+                        );
                     }
                 }
                 Action::AddComponents(entity_uid, components) => {
@@ -514,7 +530,13 @@ impl World
                 continue;
             }
 
-            event_submitter.submit_event(&Pair::new::<Added>(comp_id), entity_uid);
+            event_submitter.submit_event(
+                &Pair::builder()
+                    .relation::<Added>()
+                    .target_id(comp_id)
+                    .build(),
+                entity_uid,
+            );
         }
     }
 
@@ -539,7 +561,13 @@ impl World
                 continue;
             }
 
-            event_submitter.submit_event(&Pair::new::<Removed>(component_id), entity_uid);
+            event_submitter.submit_event(
+                &Pair::builder()
+                    .relation::<Removed>()
+                    .target_id(component_id)
+                    .build(),
+                entity_uid,
+            );
         }
     }
 
-- 
cgit v1.2.3-18-g5258