alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 16:21:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Improve implementation of next

Browse source
This commit is contained in:
Gwilym Inzani 2023-05-09 21:44:14 +01:00
parent b3e56e88f2
commit 68e68386a1
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
agb-hashmap/src/lib.rs
View file

@ -471,9 +471,9 @@ impl<'a, K, V, ALLOCATOR: ClonableAllocator> Iterator for Iter<'a, K, V, ALLOCAT
let node = &self.map.nodes.node_at(self.at); let node = &self.map.nodes.node_at(self.at);
self.at += 1; self.at += 1;
if node.has_value() { if let Some(key_value) = node.key_value_ref() {
self.num_found += 1; self.num_found += 1;
return Some((node.key_ref().unwrap(), node.value_ref().unwrap())); return Some(key_value);
} }
} }
} }

16
agb-hashmap/src/node.rs
View file

@ -34,14 +34,6 @@ impl<K, V> Node<K, V> {
} }
} }
pub(crate) fn value_ref(&self) -> Option<&V> {
if self.has_value() {
Some(unsafe { self.value_ref_unchecked() })
} else {
None
}
}
pub(crate) unsafe fn value_ref_unchecked(&self) -> &V { pub(crate) unsafe fn value_ref_unchecked(&self) -> &V {
self.value.assume_init_ref() self.value.assume_init_ref()
} }
@ -66,6 +58,14 @@ impl<K, V> Node<K, V> {
} }
} }
pub(crate) fn key_value_ref(&self) -> Option<(&K, &V)> {
if self.has_value() {
Some(unsafe { self.key_value_ref_unchecked() })
} else {
None
}
}
pub(crate) unsafe fn key_value_ref_unchecked(&self) -> (&K, &V) { pub(crate) unsafe fn key_value_ref_unchecked(&self) -> (&K, &V) {
(self.key.assume_init_ref(), self.value.assume_init_ref()) (self.key.assume_init_ref(), self.value.assume_init_ref())
} }