Remove lifetime mess, replace a lot of code with Arc instead of borrows.
Some checks failed
continuous-integration/drone/push Build is failing

This cleans up the codebase massively, and allows me to maintain some semblance of sanity.
This commit is contained in:
2022-08-20 13:17:20 +02:00
parent 2d4253e155
commit 55cc0906c9
34 changed files with 320 additions and 366 deletions

View File

@@ -1,3 +1,5 @@
use std::sync::Arc;
use indexmap::IndexMap;
use crate::Random;
@@ -7,13 +9,13 @@ use crate::StringKey;
/// by both key, while keeping their insertion order.
pub trait DataLibrary<'a, T: 'a> {
/// Returns the underlying map.
fn map(&self) -> &IndexMap<StringKey, T>;
fn map(&self) -> &IndexMap<StringKey, Arc<T>>;
/// Returns the underlying map in mutable manner.
fn get_modify(&mut self) -> &mut IndexMap<StringKey, T>;
fn get_modify(&mut self) -> &mut IndexMap<StringKey, Arc<T>>;
/// Adds a new value to the library.
fn add(&mut self, key: &StringKey, value: T) {
self.get_modify().insert(key.clone(), value);
self.get_modify().insert(key.clone(), Arc::new(value));
}
/// Removes a value from the library.
@@ -22,20 +24,15 @@ pub trait DataLibrary<'a, T: 'a> {
}
/// Gets a value from the library.
fn get(&'a self, key: &StringKey) -> Option<&'a T> {
fn get(&'a self, key: &StringKey) -> Option<&Arc<T>> {
self.map().get::<StringKey>(key)
}
/// Gets a value from the library.
fn get_by_hash(&'a self, key: u32) -> Option<&'a T> {
fn get_by_hash(&'a self, key: u32) -> Option<&Arc<T>> {
self.map().get::<u32>(&key)
}
/// Gets a mutable value from the library.
fn get_mut(&mut self, key: &StringKey) -> Option<&mut T> {
self.get_modify().get_mut(key)
}
/// Gets the amount of values in the library.
fn len(&self) -> usize {
self.map().len()
@@ -46,7 +43,7 @@ pub trait DataLibrary<'a, T: 'a> {
}
/// Gets a random value from the library.
fn random_value(&self, rand: &mut Random) -> &T {
fn random_value(&self, rand: &mut Random) -> &Arc<T> {
let i = rand.get_between(0, self.len() as i32);
return self.map().get_index(i as usize).unwrap().1;
}