Moves a bunch of libraries to traits

src/static_data/libraries/ability_library.rs

@@ -1,3 +1,4 @@
+use std::fmt::Debug;
 use std::sync::Arc;
 
 use indexmap::IndexMap;
@@ -6,26 +7,31 @@ use crate::static_data::Ability;
 use crate::static_data::DataLibrary;
 use crate::{StringKey, ValueIdentifiable, ValueIdentifier};
 
+/// A storage for all abilities that can be used in this data library.
+pub trait AbilityLibrary: DataLibrary<dyn Ability> + ValueIdentifiable + Debug {}
+
 /// A storage for all abilities that can be used in this data library.
 #[derive(Debug)]
-pub struct AbilityLibrary {
+pub struct AbilityLibraryImpl {
     /// A unique identifier so we know what value this is.
     identifier: ValueIdentifier,
     /// The underlying map for the library.
     map: IndexMap<StringKey, Arc<dyn Ability>>,
 }
 
-impl AbilityLibrary {
+impl AbilityLibraryImpl {
     /// Instantiates a new ability library.
-    pub fn new(capacity: usize) -> AbilityLibrary {
-        AbilityLibrary {
+    pub fn new(capacity: usize) -> Self {
+        Self {
             identifier: Default::default(),
             map: IndexMap::with_capacity(capacity),
         }
     }
 }
 
-impl DataLibrary<dyn Ability> for AbilityLibrary {
+impl AbilityLibrary for AbilityLibraryImpl {}
+
+impl DataLibrary<dyn Ability> for AbilityLibraryImpl {
     fn map(&self) -> &IndexMap<StringKey, Arc<dyn Ability>> {
         &self.map
     }
@@ -34,7 +40,7 @@ impl DataLibrary<dyn Ability> for AbilityLibrary {
     }
 }
 
-impl ValueIdentifiable for AbilityLibrary {
+impl ValueIdentifiable for AbilityLibraryImpl {
     fn value_identifier(&self) -> ValueIdentifier {
         self.identifier
     }
@@ -42,14 +48,14 @@ impl ValueIdentifiable for AbilityLibrary {
 
 #[cfg(test)]
 pub mod tests {
+    use crate::static_data::libraries::ability_library::AbilityLibraryImpl;
     use crate::static_data::AbilityImpl;
-    use crate::static_data::AbilityLibrary;
     use crate::static_data::DataLibrary;
     use crate::StringKey;
     use std::sync::Arc;
 
-    pub fn build() -> AbilityLibrary {
-        let mut lib = AbilityLibrary::new(1);
+    pub fn build() -> AbilityLibraryImpl {
+        let mut lib = AbilityLibraryImpl::new(1);
         lib.add(
             &StringKey::new("test_ability"),
             Arc::new(AbilityImpl::new(