1 files changed, 22 insertions, 18 deletions

diff --git a/ecs/src/relationship.rs b/ecs/src/relationship.rs
index 235c21e..45fa265 100644
--- a/ecs/src/relationship.rs
+++ b/ecs/src/relationship.rs
@@ -4,17 +4,21 @@ use std::marker::PhantomData;
 use ecs_macros::Component;
 
 use crate::component::storage::Storage as ComponentStorage;
-use crate::component::{Component, FromLockedOptional as FromLockedOptionalComponent};
+use crate::component::{
+    Component,
+    FromLockedOptional as FromLockedOptionalComponent,
+    Handle as ComponentHandle,
+    HandleMut as ComponentHandleMut,
+};
 use crate::lock::{Error as LockError, Lock, ReadGuard};
-use crate::system::{ComponentRef, ComponentRefMut};
 use crate::uid::{Kind as UidKind, Uid};
 use crate::World;
 
 /// A relationship to one or more targets.
 #[derive(Debug, Component)]
 #[component(
-    ref_type = Relation<'component, Kind, ComponentT>,
-    ref_mut_type = RelationMut<'component, Kind, ComponentT>,
+    handle_type = Relation<'component, Kind, ComponentT>,
+    handle_mut_type = RelationMut<'component, Kind, ComponentT>,
 )]
 pub struct Relationship<Kind, ComponentT: Component>
 where
@@ -63,7 +67,7 @@ where
     ComponentT: Component,
 {
     component_storage_lock: ReadGuard<'rel_comp, ComponentStorage>,
-    relationship_comp: ComponentRefMut<'rel_comp, Relationship<Kind, ComponentT>>,
+    relationship_comp: ComponentHandleMut<'rel_comp, Relationship<Kind, ComponentT>>,
 }
 
 impl<'rel_comp, Kind, ComponentT> FromLockedOptionalComponent<'rel_comp>
@@ -76,12 +80,12 @@ where
         world: &'rel_comp World,
     ) -> Result<Self, LockError>
     {
-        let relationship_comp_ref_from_locked_opt_comp = ComponentRefMut::<
+        let relationship_comp_handle_from_locked_opt_comp = ComponentHandleMut::<
             Relationship<Kind, ComponentT>,
         >::from_locked_optional_component;
 
         let relationship_comp =
-            relationship_comp_ref_from_locked_opt_comp(optional_component, world)?;
+            relationship_comp_handle_from_locked_opt_comp(optional_component, world)?;
 
         let component_storage_lock = world
             .data
@@ -124,7 +128,7 @@ where
     /// Will panic if the entity does not exist in the archetype it belongs to. This
     /// should hopefully never happend.
     #[must_use]
-    pub fn get(&self, index: usize) -> Option<ComponentRefMut<'_, ComponentT>>
+    pub fn get(&self, index: usize) -> Option<ComponentHandleMut<'_, ComponentT>>
     {
         let target = self.get_target(index)?;
 
@@ -136,7 +140,7 @@ where
 
         let component_index = archetype.get_index_for_component(ComponentT::id())?;
 
-        let component = ComponentRefMut::new(
+        let component = ComponentHandleMut::new(
             entity
                 .components()
                 .get(component_index)?
@@ -235,7 +239,7 @@ where
     ComponentT: Component,
 {
     type IntoIter = TargetComponentIterMut<'relationship, 'rel_comp, Kind, ComponentT>;
-    type Item = ComponentRefMut<'rel_comp, ComponentT>;
+    type Item = ComponentHandleMut<'rel_comp, ComponentT>;
 
     fn into_iter(self) -> Self::IntoIter
     {
@@ -260,7 +264,7 @@ where
     Kind: 'static,
     ComponentT: Component,
 {
-    type Item = ComponentRefMut<'rel_comp, ComponentT>;
+    type Item = ComponentHandleMut<'rel_comp, ComponentT>;
 
     fn next(&mut self) -> Option<Self::Item>
     {
@@ -285,7 +289,7 @@ where
     ComponentT: Component,
 {
     component_storage_lock: ReadGuard<'rel_comp, ComponentStorage>,
-    relationship_comp: ComponentRef<'rel_comp, Relationship<Kind, ComponentT>>,
+    relationship_comp: ComponentHandle<'rel_comp, Relationship<Kind, ComponentT>>,
 }
 
 impl<'rel_comp, Kind, ComponentT> FromLockedOptionalComponent<'rel_comp>
@@ -298,12 +302,12 @@ where
         world: &'rel_comp World,
     ) -> Result<Self, LockError>
     {
-        let relationship_comp_ref_from_locked_opt_comp = ComponentRef::<
+        let relationship_comp_handle_from_locked_opt_comp = ComponentHandle::<
             Relationship<Kind, ComponentT>,
         >::from_locked_optional_component;
 
         let relationship_comp =
-            relationship_comp_ref_from_locked_opt_comp(optional_component, world)?;
+            relationship_comp_handle_from_locked_opt_comp(optional_component, world)?;
 
         let component_storage_lock = world
             .data
@@ -346,7 +350,7 @@ where
     /// Will panic if the entity does not exist in the archetype it belongs to. This
     /// should hopefully never happend.
     #[must_use]
-    pub fn get(&self, index: usize) -> Option<ComponentRef<'_, ComponentT>>
+    pub fn get(&self, index: usize) -> Option<ComponentHandle<'_, ComponentT>>
     {
         let target = self.get_target(index)?;
 
@@ -358,7 +362,7 @@ where
 
         let component_index = archetype.get_index_for_component(ComponentT::id())?;
 
-        let component = ComponentRef::new(
+        let component = ComponentHandle::new(
             entity
                 .components()
                 .get(component_index)?
@@ -416,7 +420,7 @@ where
     ComponentT: Component,
 {
     type IntoIter = TargetComponentIter<'relationship, 'rel_comp, Kind, ComponentT>;
-    type Item = ComponentRef<'rel_comp, ComponentT>;
+    type Item = ComponentHandle<'rel_comp, ComponentT>;
 
     fn into_iter(self) -> Self::IntoIter
     {
@@ -441,7 +445,7 @@ where
     Kind: 'static,
     ComponentT: Component,
 {
-    type Item = ComponentRef<'rel_comp, ComponentT>;
+    type Item = ComponentHandle<'rel_comp, ComponentT>;
 
     fn next(&mut self) -> Option<Self::Item>
     {