only slotmap allowed

Author: Nertsal

Cargo.toml

@@ -13,8 +13,7 @@ repository = "https://github.com/Nertsal/stecs"
 [features]
 default = ["slotmap", "query_mut"]
 query_mut = ["stecs-derive/query_mut"]
-slotmap = ["dep:slotmap"]
-dynamic = ["stecs-derive/dynamic", "dep:anymap3"]
+dynamic = ["stecs-derive/dynamic"]
 
 [workspace]
 members = ["crates/*"]

crates/stecs-derive/src/split.rs

@@ -743,15 +743,17 @@ The given `ids` must not repeat and must be valid and present id's in the storag
                     #[doc = #insert_dyn_doc]
                     pub fn insert_dyn<__T>(&mut self, id: #generic_family_name::Id, component: __T)
                     where
-                        #generic_family_name::Storage<__T>: ::anymap3::CloneAny
+                        __T: Clone + 'static,
+                        #generic_family_name::Id: 'static,
                     {
                         self.r#dyn.insert(id, component)
                     }
 
                     #[doc = #remove_dyn_doc]
                     pub fn remove_dyn<__T>(&mut self, id: #generic_family_name::Id) -> Option<__T>
                     where
-                        #generic_family_name::Storage<__T>: ::anymap3::CloneAny
+                        __T: Clone + 'static,
+                        #generic_family_name::Id: 'static,
                     {
                         self.r#dyn.remove(id)
                     }

src/dynamic/mod.rs

@@ -1,4 +1,4 @@
-use crate::storage::{Storage, StorageFamily};
+use crate::storage::{sparse::Sparse, Storage, StorageFamily};
 
 use std::marker::PhantomData;
 
@@ -15,11 +15,7 @@ pub struct DynamicStorage<F> {
     id: PhantomData<F>,
 }
 
-// TODO: should really be Sparse most of the time;
-// maybe independent from the main storage type.
-// Could depend on component type via a trait,
-// but then we cannot match Id's freely.
-type InnerMap<F, T> = <F as StorageFamily>::Storage<T>;
+type InnerMap<F, T> = Sparse<T, <F as StorageFamily>::Id>;
 
 impl<F> Clone for DynamicStorage<F> {
     fn clone(&self) -> Self {

src/storage/mod.rs

@@ -1,14 +1,12 @@
-#[cfg(feature = "slotmap")]
 pub mod dense;
-#[cfg(feature = "slotmap")]
 pub mod sparse;
 
 /// A storage of components.
 pub trait Storage<T>: Default {
     /// Type of the abstract family corresponding to the storages of this type.
     type Family: StorageFamily;
     /// Type of the identifier used for components/entities.
-    type Id: Copy;
+    type Id: slotmap::Key;
 
     /// Insert a new component to at the specified id.
     fn insert(&mut self, id: Self::Id, value: T);
@@ -44,7 +42,7 @@ pub trait Storage<T>: Default {
 /// A family of storages for different component types.
 pub trait StorageFamily {
     /// Type of the identifier used for components/entities.
-    type Id: Copy;
+    type Id: slotmap::Key;
     /// Type of a specific storage.
     type Storage<T>: Storage<T, Family = Self, Id = Self::Id>;
     type Generator: IdGenerator<Id = Self::Id>;
@@ -59,7 +57,7 @@ pub trait StorageFamily {
 ///
 pub unsafe trait IdGenerator {
     /// The identifier type being generated.
-    type Id: Copy;
+    type Id: slotmap::Key;
 
     /// Returns the unique id's of all active entities in the storage in an arbitrary order.
     ///