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

Rename get_location to location

Browse source
This commit is contained in:
Gwilym Kuiper 2022-03-23 20:22:37 +00:00
parent 48ddda9ae9
commit 84b7317380
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
agb/src/hash_map.rs
View file

@ -206,7 +206,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.nodes.get_location(&key, hash) { if let Some(location) = self.nodes.location(&key, hash) {
Some(self.nodes.replace_at_location(location, key, value)) Some(self.nodes.replace_at_location(location, key, value))
} else { } else {
if self.nodes.capacity() * 85 / 100 <= self.len() { if self.nodes.capacity() * 85 / 100 <= self.len() {
@ -222,7 +222,7 @@ where
fn insert_and_get(&mut self, key: K, value: V) -> &'_ mut V { fn insert_and_get(&mut self, key: K, value: V) -> &'_ mut V {
let hash = self.hash(&key); let hash = self.hash(&key);
let location = if let Some(location) = self.nodes.get_location(&key, hash) { let location = if let Some(location) = self.nodes.location(&key, hash) {
self.nodes.replace_at_location(location, key, value); self.nodes.replace_at_location(location, key, value);
location location
} else { } else {
@ -239,7 +239,7 @@ where
/// Returns `true` if the map contains a value for the specified key. /// Returns `true` if the map contains a value for the specified key.
pub fn contains_key(&self, k: &K) -> bool { pub fn contains_key(&self, k: &K) -> bool {
let hash = self.hash(k); let hash = self.hash(k);
self.nodes.get_location(k, hash).is_some() self.nodes.location(k, hash).is_some()
} }
/// Returns the key-value pair corresponding to the supplied key /// Returns the key-value pair corresponding to the supplied key
@ -247,7 +247,7 @@ where
let hash = self.hash(key); let hash = self.hash(key);
self.nodes self.nodes
.get_location(key, hash) .location(key, hash)
.and_then(|location| self.nodes.nodes[location].key_value_ref()) .and_then(|location| self.nodes.nodes[location].key_value_ref())
} }
@ -262,7 +262,7 @@ where
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.nodes.get_location(key, hash) { if let Some(location) = self.nodes.location(key, hash) {
self.nodes.nodes[location].value_mut() self.nodes.nodes[location].value_mut()
} else { } else {
None None
@ -275,7 +275,7 @@ where
let hash = self.hash(key); let hash = self.hash(key);
self.nodes self.nodes
.get_location(key, hash) .location(key, hash)
.map(|location| self.nodes.remove_from_location(location)) .map(|location| self.nodes.remove_from_location(location))
} }
} }
@ -504,7 +504,7 @@ where
/// Gets the given key's corresponding entry in the map for in-place manipulation. /// Gets the given key's corresponding entry in the map for in-place manipulation.
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.nodes.get_location(&key, hash); let location = self.nodes.location(&key, hash);
if let Some(location) = location { if let Some(location) = location {
Entry::Occupied(OccupiedEntry { Entry::Occupied(OccupiedEntry {
@ -653,7 +653,7 @@ impl<K, V> NodeStorage<K, V> {
} }
} }
fn get_location(&self, key: &K, hash: HashType) -> Option<usize> fn location(&self, key: &K, hash: HashType) -> Option<usize>
where where
K: Eq, K: Eq,
{ {