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

Fully implement OccupiedEntry

Browse source
This commit is contained in:
Gwilym Kuiper 2022-03-20 15:13:22 +00:00
parent 631e1e9bc2
commit 6bc3816b29
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
agb/src/hash_map.rs
View file

@ -157,7 +157,8 @@ impl<'a, K, V> IntoIterator for &'a HashMap<K, V> {
pub struct OccupiedEntry<'a, K: 'a, V: 'a> { pub struct OccupiedEntry<'a, K: 'a, V: 'a> {
key: K, key: K,
entry: &'a mut Node<K, V>, map: &'a mut HashMap<K, V>,
location: usize,
} }
impl<'a, K: 'a, V: 'a> OccupiedEntry<'a, K, V> { impl<'a, K: 'a, V: 'a> OccupiedEntry<'a, K, V> {
@ -165,16 +166,29 @@ impl<'a, K: 'a, V: 'a> OccupiedEntry<'a, K, V> {
&self.key &self.key
} }
pub fn remove_entry(self) -> (K, V) {
let old_value = self.map.nodes.remove_from_location(self.location);
(self.key, old_value)
}
pub fn get(&self) -> &V { pub fn get(&self) -> &V {
self.entry.value_ref().unwrap() self.map.nodes.nodes[self.location].value_ref().unwrap()
}
pub fn get_mut(&mut self) -> &mut V {
self.map.nodes.nodes[self.location].value_mut().unwrap()
} }
pub fn into_mut(self) -> &'a mut V { pub fn into_mut(self) -> &'a mut V {
self.entry.value_mut().unwrap() self.map.nodes.nodes[self.location].value_mut().unwrap()
} }
pub fn insert(&mut self, value: V) -> V { pub fn insert(&mut self, value: V) -> V {
self.entry.replace_value(value) self.map.nodes.nodes[self.location].replace_value(value)
}
pub fn remove(self) -> V {
self.map.nodes.remove_from_location(self.location)
} }
} }
@ -236,8 +250,8 @@ where
F: FnOnce(&mut V), F: FnOnce(&mut V),
{ {
match self { match self {
Entry::Occupied(e) => { Entry::Occupied(mut e) => {
f(e.entry.value_mut().unwrap()); f(e.get_mut());
Entry::Occupied(e) Entry::Occupied(e)
} }
Entry::Vacant(e) => Entry::Vacant(e), Entry::Vacant(e) => Entry::Vacant(e),
@ -273,7 +287,8 @@ where
if let Some(location) = location { if let Some(location) = location {
Entry::Occupied(OccupiedEntry { Entry::Occupied(OccupiedEntry {
key, key,
entry: &mut self.nodes.nodes[location], location,
map: self,
}) })
} else { } else {
Entry::Vacant(VacantEntry { key, map: self }) Entry::Vacant(VacantEntry { key, map: self })