From ec883f3fd7bec95ff2ab6b482cc3b7ce6e40a293 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Wed, 2 Apr 2025 13:22:18 +0200
Subject: refactor(ecs): remove unnecessary component::FromOptional* traits

---
 ecs/src/component.rs | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

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

diff --git a/ecs/src/component.rs b/ecs/src/component.rs
index 265eb9e..63be828 100644
--- a/ecs/src/component.rs
+++ b/ecs/src/component.rs
@@ -8,7 +8,7 @@ use crate::event::component::{
     Kind as ComponentEventKind,
     Removed as ComponentRemovedEvent,
 };
-use crate::lock::{Error as LockError, Lock, ReadGuard, WriteGuard};
+use crate::lock::{Error as LockError, Lock};
 use crate::system::Input as SystemInput;
 use crate::type_name::TypeName;
 use crate::uid::Uid;
@@ -26,11 +26,11 @@ pub trait Component: SystemInput + Any + TypeName
     where
         Self: Sized;
 
-    type RefMut<'component>: FromOptionalMut<'component> + FromLockedOptional<'component>
+    type RefMut<'component>: FromLockedOptional<'component>
     where
         Self: Sized;
 
-    type Ref<'component>: FromOptional<'component> + FromLockedOptional<'component>
+    type Ref<'component>: FromLockedOptional<'component>
     where
         Self: Sized;
 
@@ -101,8 +101,8 @@ impl TypeName for Box<dyn Component>
 impl<ComponentT> Component for Option<ComponentT>
 where
     ComponentT: Component,
-    for<'a> Option<ComponentT::Ref<'a>>: FromOptional<'a> + FromLockedOptional<'a>,
-    for<'a> Option<ComponentT::RefMut<'a>>: FromOptionalMut<'a> + FromLockedOptional<'a>,
+    for<'a> Option<ComponentT::Ref<'a>>: FromLockedOptional<'a>,
+    for<'a> Option<ComponentT::RefMut<'a>>: FromLockedOptional<'a>,
 {
     type Component = ComponentT;
     type Ref<'component> = Option<ComponentT::Ref<'component>>;
@@ -220,22 +220,6 @@ impl Metadata
     }
 }
 
-pub trait FromOptionalMut<'comp>
-{
-    fn from_optional_mut_component(
-        optional_component: Option<WriteGuard<'comp, Box<dyn Component>>>,
-        world: &'comp World,
-    ) -> Self;
-}
-
-pub trait FromOptional<'comp>
-{
-    fn from_optional_component(
-        optional_component: Option<ReadGuard<'comp, Box<dyn Component>>>,
-        world: &'comp World,
-    ) -> Self;
-}
-
 pub trait FromLockedOptional<'comp>: Sized
 {
     /// Converts a reference to a optional locked boxed component to a instance of `Self`.
@@ -254,12 +238,7 @@ macro_rules! inner {
             impl<#(IntoComp~I,)*> Sequence for (#(IntoComp~I,)*)
                 where
                 #(
-                    for<'comp> IntoComp~I: Into<
-                        Component: Component<
-                            RefMut<'comp>: FromOptionalMut<'comp>,
-                            Ref<'comp>: FromOptional<'comp>
-                        >
-                    >,
+                    for<'comp> IntoComp~I: Into<Component: Component>,
                 )*
             {
                 const COUNT: usize = $c + 1;
-- 
cgit v1.2.3-18-g5258