alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-23 15:46:33 +11:00
Code Issues Projects Releases Packages Wiki Activity

Move the implementation of get_location to NodeStorage

Browse source
This commit is contained in:
Gwilym Kuiper 2022-03-19 22:04:53 +00:00
parent 321702531b
commit cd9798d01f
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
agb/src/hash_map.rs
View file

@ -207,15 +207,6 @@ const fn fast_mod(len: usize, hash: HashType) -> usize {
(hash as usize) & (len - 1) (hash as usize) & (len - 1)
} }
impl<K, V> HashMap<K, V>
where
K: Eq,
{
fn get_location(&self, key: &K, hash: HashType) -> Option<usize> {
self.nodes.get_location(key, hash)
}
}
impl<K, V> HashMap<K, V> impl<K, V> HashMap<K, V>
where where
K: Eq + Hash, K: Eq + Hash,
@ -223,7 +214,7 @@ where
pub fn insert(&mut self, key: K, value: V) -> Option<V> { pub fn insert(&mut self, key: K, value: V) -> Option<V> {
let hash = self.hash(&key); let hash = self.hash(&key);
if let Some(location) = self.get_location(&key, hash) { if let Some(location) = self.nodes.get_location(&key, hash) {
let old_node = self.nodes.nodes[location].take().unwrap(); let old_node = self.nodes.nodes[location].take().unwrap();
let (new_node, old_value) = old_node.with_new_key_value(key, value); let (new_node, old_value) = old_node.with_new_key_value(key, value);
self.nodes.nodes[location] = Some(new_node); self.nodes.nodes[location] = Some(new_node);
@ -242,14 +233,15 @@ where
pub fn get(&self, key: &K) -> Option<&V> { pub fn get(&self, key: &K) -> Option<&V> {
let hash = self.hash(key); let hash = self.hash(key);
self.get_location(key, hash) self.nodes
.get_location(key, hash)
.map(|location| &self.nodes.nodes[location].as_ref().unwrap().value) .map(|location| &self.nodes.nodes[location].as_ref().unwrap().value)
} }
pub fn get_mut(&mut self, key: &K) -> Option<&mut V> { pub fn get_mut(&mut self, key: &K) -> Option<&mut V> {
let hash = self.hash(key); let hash = self.hash(key);
if let Some(location) = self.get_location(key, hash) { if let Some(location) = self.nodes.get_location(key, hash) {
Some(&mut self.nodes.nodes[location].as_mut().unwrap().value) Some(&mut self.nodes.nodes[location].as_mut().unwrap().value)
} else { } else {
None None
@ -259,7 +251,8 @@ where
pub fn remove(&mut self, key: &K) -> Option<V> { pub fn remove(&mut self, key: &K) -> Option<V> {
let hash = self.hash(key); let hash = self.hash(key);
self.get_location(key, hash) self.nodes
.get_location(key, hash)
.map(|location| self.nodes.remove_from_location(location)) .map(|location| self.nodes.remove_from_location(location))
} }
} }
@ -362,7 +355,7 @@ where
{ {
pub fn entry(&mut self, key: K) -> Entry<'_, K, V> { pub fn entry(&mut self, key: K) -> Entry<'_, K, V> {
let hash = self.hash(&key); let hash = self.hash(&key);
let location = self.get_location(&key, hash); let location = self.nodes.get_location(&key, hash);
if let Some(location) = location { if let Some(location) = location {
Entry::Occupied(OccupiedEntry { Entry::Occupied(OccupiedEntry {