2 files changed, 28 insertions, 59 deletions

diff --git a/ecs/src/component/storage/archetype.rs b/ecs/src/component/storage/archetype.rs
index f8c204b..d96632e 100644
--- a/ecs/src/component/storage/archetype.rs
+++ b/ecs/src/component/storage/archetype.rs
@@ -7,7 +7,6 @@ use std::slice::Iter as SliceIter;
 
 use hashbrown::HashMap;
 
-use crate::component::Metadata as ComponentMetadata;
 use crate::lock::Lock;
 use crate::uid::{Kind as UidKind, Uid};
 use crate::util::{Either, HashMapExt};
@@ -123,7 +122,7 @@ impl Archetype
     pub fn get_matching_component_indices(
         &self,
         component_id: Uid,
-    ) -> MatchingComponentIter
+    ) -> MatchingComponentIter<'_>
     {
         assert!(
             component_id.kind() == UidKind::Component
@@ -155,7 +154,7 @@ impl Archetype
             inner: Either::B(
                 [component_id]
                     .into_iter()
-                    .zip(self.get_index_for_component(component_id).into_iter()),
+                    .zip(self.get_index_for_component(component_id)),
             ),
         }
     }
@@ -219,19 +218,20 @@ type MatchingComponentIterFilterFn = fn(&((usize, &Uid), Uid)) -> bool;
 
 type MatchingComponentIterMapFn = fn(((usize, &Uid), Uid)) -> (Uid, usize);
 
+type InnerMatchingComponentIterA<'archetype> = Map<
+    Filter<
+        Zip<Enumerate<SliceIter<'archetype, Uid>>, RepeatN<Uid>>,
+        MatchingComponentIterFilterFn,
+    >,
+    MatchingComponentIterMapFn,
+>;
+
+type InnerMatchingComponentIterB = Zip<ArrayIntoIter<Uid, 1>, OptionIntoIter<usize>>;
+
 #[derive(Debug)]
 pub struct MatchingComponentIter<'archetype>
 {
-    inner: Either<
-        Map<
-            Filter<
-                Zip<Enumerate<SliceIter<'archetype, Uid>>, RepeatN<Uid>>,
-                MatchingComponentIterFilterFn,
-            >,
-            MatchingComponentIterMapFn,
-        >,
-        Zip<ArrayIntoIter<Uid, 1>, OptionIntoIter<usize>>,
-    >,
+    inner: Either<InnerMatchingComponentIterA<'archetype>, InnerMatchingComponentIterB>,
 }
 
 impl Iterator for MatchingComponentIter<'_>
@@ -314,29 +314,18 @@ impl Entity
 #[derive(Debug)]
 pub struct EntityComponent
 {
-    id: Uid,
     component: Lock<Box<dyn Any>>,
 }
 
 impl EntityComponent
 {
-    pub fn new(
-        component: Box<dyn Any>,
-        component_id: Uid,
-        component_name: &'static str,
-    ) -> Self
+    pub fn new(component: Box<dyn Any>, component_name: &'static str) -> Self
     {
         Self {
-            id: component_id,
             component: Lock::new(component, component_name),
         }
     }
 
-    pub fn id(&self) -> Uid
-    {
-        self.id
-    }
-
     pub fn component(&self) -> &Lock<Box<dyn Any>>
     {
         &self.component
@@ -352,52 +341,32 @@ pub struct Id
 
 impl Id
 {
-    pub fn new(component_ids: &impl AsRef<[Uid]>) -> Self
+    pub fn new_empty() -> Self
     {
-        if component_ids.as_ref().is_empty() {
-            return Self { hash: 0 };
-        }
-
-        debug_assert!(
-            component_ids.as_ref().is_sorted(),
-            "Cannot create archetype ID from unsorted component IDs"
-        );
-
-        let mut hasher = DefaultHasher::new();
-
-        for component_id in component_ids.as_ref() {
-            component_id.hash(&mut hasher);
-        }
-
-        Self { hash: hasher.finish() }
+        Self { hash: 0 }
     }
 
-    pub fn from_components_metadata<'a>(
-        components_metadata: impl IntoIterator<Item = &'a ComponentMetadata>,
-    ) -> Self
+    pub fn new<'a>(component_ids: impl IntoIterator<Item = &'a Uid>) -> Self
     {
         let mut hasher = DefaultHasher::new();
 
         let mut prev_component_id: Option<Uid> = None;
 
-        let mut comp_metadata_iter = components_metadata.into_iter().peekable();
+        let mut component_id_iter = component_ids.into_iter().peekable();
 
-        if comp_metadata_iter.peek().is_none() {
-            return Self { hash: 0 };
+        if component_id_iter.peek().is_none() {
+            return Self::new_empty();
         }
 
-        for comp_metadata in comp_metadata_iter {
-            if prev_component_id
-                .is_some_and(|prev_comp_id| comp_metadata.id < prev_comp_id)
-            {
-                panic!(
-                    "Cannot create archetype ID from a unsorted component metadata list"
-                );
-            }
+        for comp_id in component_id_iter {
+            assert!(
+                prev_component_id.is_none_or(|prev_comp_id| *comp_id >= prev_comp_id),
+                "Cannot create archetype ID from a unsorted component metadata list"
+            );
 
-            prev_component_id = Some(comp_metadata.id);
+            prev_component_id = Some(*comp_id);
 
-            comp_metadata.id.hash(&mut hasher);
+            comp_id.hash(&mut hasher);
         }
 
         Self { hash: hasher.finish() }
diff --git a/ecs/src/component/storage/graph.rs b/ecs/src/component/storage/graph.rs
index 29fa937..76200f9 100644
--- a/ecs/src/component/storage/graph.rs
+++ b/ecs/src/component/storage/graph.rs
@@ -80,7 +80,7 @@ impl Graph
     pub fn dfs_archetype_add_edges(
         &self,
         archetype_id: ArchetypeId,
-    ) -> Option<ArchetypeAddEdgeDfsIter>
+    ) -> Option<ArchetypeAddEdgeDfsIter<'_>>
     {
         let node = self.get_node_by_id(archetype_id)?;