refactor(ecs): make ObserveIter return EventMatch struct

2 files changed, 8 insertions, 4 deletions

diff --git a/ecs/examples/component_changed_event.rs b/ecs/examples/component_changed_event.rs
index f707255..6dde384 100644
--- a/ecs/examples/component_changed_event.rs
+++ b/ecs/examples/component_changed_event.rs
@@ -32,8 +32,12 @@ fn print_changed_greetings(observe: Observe<'_, Pair<Changed, Greeting>>)
 {
     println!("\nChanged greetings:");
 
-    for ent in &observe {
-        let Some(greeting) = ent.get::<Greeting>() else {
+    for evt_match in &observe {
+        let Some(changed_ent) = evt_match.get_entity() else {
+            continue;
+        };
+
+        let Some(greeting) = changed_ent.get::<Greeting>() else {
             unreachable!();
         };
 
diff --git a/ecs/examples/component_removed_event.rs b/ecs/examples/component_removed_event.rs
index ffa37f4..e8d1a47 100644
--- a/ecs/examples/component_removed_event.rs
+++ b/ecs/examples/component_removed_event.rs
@@ -20,8 +20,8 @@ fn eat_cheese(query: Query<(&Cheese,)>, mut actions: Actions)
 
 fn on_cheese_removed(observe: Observe<Pair<Removed, Cheese>>)
 {
-    for cheese_ent in &observe {
-        println!("Cheese entity {} was eaten", cheese_ent.uid());
+    for evt_match in &observe {
+        println!("Cheese entity {} was eaten", evt_match.id());
     }
 }