A lot more work on a bunch of different parts of the system.

src/static_data/libraries/data_library.rs

@@ -1,29 +1,30 @@
 use crate::utils::random::Random;
+use crate::StringKey;
 use hashbrown::HashMap;
 
 pub trait DataLibrary<'a, T: 'a> {
-    fn map(&self) -> &HashMap<String, T>;
-    fn list_values(&self) -> &Vec<String>;
-    fn get_modify(&mut self) -> (&mut HashMap<String, T>, &mut Vec<String>);
+    fn map(&self) -> &HashMap<StringKey, T>;
+    fn list_values(&self) -> &Vec<StringKey>;
+    fn get_modify(&mut self) -> (&mut HashMap<StringKey, T>, &mut Vec<StringKey>);
 
-    fn add(&mut self, key: &str, value: T) {
+    fn add(&mut self, key: &StringKey, value: T) {
         let modifies = self.get_modify();
-        modifies.0.insert(key.to_string(), value);
-        modifies.1.push(key.to_string());
+        modifies.0.insert(key.clone(), value);
+        modifies.1.push(key.clone());
     }
 
-    fn remove(&mut self, key: &str) {
+    fn remove(&mut self, key: &StringKey) {
         let modifies = self.get_modify();
-        let index = modifies.1.iter().position(|r| *r == key).unwrap();
+        let index = modifies.1.iter().position(|r| r == key).unwrap();
         modifies.0.remove(key);
         modifies.1.remove(index);
     }
 
-    fn get(&self, key: &str) -> Option<&T> {
+    fn get(&self, key: &StringKey) -> Option<&T> {
         self.map().get(key)
     }
 
-    fn get_mut(&mut self, key: &str) -> Option<&mut T> {
+    fn get_mut(&mut self, key: &StringKey) -> Option<&mut T> {
         self.get_modify().0.get_mut(key)
     }