refactor(ecs): replace component::IsOptional enum with bool

1 files changed, 5 insertions, 13 deletions

diff --git a/ecs/src/component/storage.rs b/ecs/src/component/storage.rs
index dd9e383..0475bf1 100644
--- a/ecs/src/component/storage.rs
+++ b/ecs/src/component/storage.rs
@@ -7,11 +7,7 @@ use std::vec::IntoIter as OwnedVecIter;
 use hashbrown::{HashMap, HashSet};
 
 use crate::archetype::Id as ArchetypeId;
-use crate::component::{
-    Component,
-    IsOptional as ComponentIsOptional,
-    Metadata as ComponentMetadata,
-};
+use crate::component::{Component, Metadata as ComponentMetadata};
 use crate::type_name::TypeName;
 use crate::uid::Uid;
 use crate::EntityComponent;
@@ -548,7 +544,7 @@ where
         .filter_map(|item| {
             let component_metadata = item.borrow();
 
-            if component_metadata.is_optional == ComponentIsOptional::Yes {
+            if component_metadata.is_optional {
                 return None;
             }
 
@@ -565,11 +561,7 @@ mod tests
 
     use super::Storage;
     use crate::archetype::Id as ArchetypeId;
-    use crate::component::{
-        Component,
-        IsOptional as ComponentIsOptional,
-        Metadata as ComponentMetadata,
-    };
+    use crate::component::{Component, Metadata as ComponentMetadata};
     use crate::uid::{Kind as UidKind, Uid};
 
     #[derive(Debug, Component)]
@@ -638,11 +630,11 @@ mod tests
         let mut components_metadata = [
             ComponentMetadata {
                 id: HealthPotion::id(),
-                is_optional: ComponentIsOptional::No,
+                is_optional: false,
             },
             ComponentMetadata {
                 id: Hookshot::id(),
-                is_optional: ComponentIsOptional::No,
+                is_optional: false,
             },
         ];