From aec5aab3a95bb96bd32b560598851dfc2f322fad Mon Sep 17 00:00:00 2001 From: Clark Gaebel Date: Tue, 18 Nov 2014 19:35:24 -0800 Subject: [PATCH] more code review --- phf/src/map.rs | 16 ++++++++-------- phf/src/ordered_map.rs | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/phf/src/map.rs b/phf/src/map.rs index 583d71ed..41e16e8e 100644 --- a/phf/src/map.rs +++ b/phf/src/map.rs @@ -62,7 +62,7 @@ impl Index for Map where K: PhfHash+Eq { impl Map where K: PhfHash+Eq { /// Returns a reference to the value that `key` maps to. pub fn get(&self, key: &K) -> Option<&V> { - self.get_entry(key, |k| key == k).map(|e| &e.1) + self.get_entry_(key, |k| key == k).map(|e| &e.1) } /// Determines if `key` is in the `Map`. @@ -75,7 +75,7 @@ impl Map where K: PhfHash+Eq { /// /// This can be useful for interning schemes. pub fn get_key(&self, key: &K) -> Option<&K> { - self.get_entry(key, |k| key == k).map(|e| &e.0) + self.get_entry_(key, |k| key == k).map(|e| &e.0) } } @@ -90,7 +90,7 @@ impl Map { self.entries.len() } - fn get_entry(&self, key: &T, check: |&K| -> bool) -> Option<&(K, V)> where T: PhfHash { + fn get_entry_(&self, key: &T, check: |&K| -> bool) -> Option<&(K, V)> where T: PhfHash { let (g, f1, f2) = key.phf_hash(self.key); let (d1, d2) = self.disps[(g % (self.disps.len() as u32)) as uint]; let entry = &self.entries[(shared::displace(f1, f2, d1, d2) % (self.entries.len() as u32)) @@ -103,25 +103,25 @@ impl Map { } /// Like `get`, but returns both the key and the value. - pub fn get_kv(&self, key: &T) -> Option<(&K, &V)> where T: PhfHash+Equiv { - self.get_entry(key, |k| key.equiv(k)).map(|e| (&e.0, &e.1)) + pub fn get_entry(&self, key: &T) -> Option<(&K, &V)> where T: PhfHash+Equiv { + self.get_entry_(key, |k| key.equiv(k)).map(|e| (&e.0, &e.1)) } /// Like `get`, but can operate on any type that is equivalent to a key. pub fn get_equiv(&self, key: &T) -> Option<&V> where T: PhfHash+Equiv { - self.get_entry(key, |k| key.equiv(k)).map(|e| &e.1) + self.get_entry_(key, |k| key.equiv(k)).map(|e| &e.1) } /// Like `get_key`, but can operate on any type that is equivalent to a /// key. pub fn get_key_equiv(&self, key: &T) -> Option<&K> where T: PhfHash+Equiv { - self.get_entry(key, |k| key.equiv(k)).map(|e| &e.0) + self.get_entry_(key, |k| key.equiv(k)).map(|e| &e.0) } /// Like `get_kv`, but can operate on any type that is equivalent to a /// key. pub fn get_kv_equiv(&self, key: &T) -> Option<(&K, &V)> where T: PhfHash+Equiv { - self.get_entry(key, |k| key.equiv(k)).map(|e| (&e.0, &e.1)) + self.get_entry_(key, |k| key.equiv(k)).map(|e| (&e.0, &e.1)) } /// Returns an iterator over the key/value pairs in the map. diff --git a/phf/src/ordered_map.rs b/phf/src/ordered_map.rs index 755d4dfb..ad7426f3 100644 --- a/phf/src/ordered_map.rs +++ b/phf/src/ordered_map.rs @@ -67,7 +67,7 @@ impl Index for OrderedMap where K: PhfHash+Eq { impl OrderedMap where K: PhfHash+Eq { /// Returns a reference to the value that `key` maps to. pub fn get(&self, key: &K) -> Option<&V> { - self.get_entry(key, |k| key == k).map(|(_, e)| &e.1) + self.get_entry_(key, |k| key == k).map(|(_, e)| &e.1) } /// Determines if `key` is in the `Map`. @@ -80,13 +80,13 @@ impl OrderedMap where K: PhfHash+Eq { /// /// This can be useful for interning schemes. pub fn get_key(&self, key: &K) -> Option<&K> { - self.get_entry(key, |k| k == key).map(|(_, e)| &e.0) + self.get_entry_(key, |k| k == key).map(|(_, e)| &e.0) } /// Returns the index of the key within the list used to initialize /// the ordered map. pub fn get_index(&self, key: &K) -> Option { - self.get_entry(key, |k| k == key).map(|(i, _)| i) + self.get_entry_(key, |k| k == key).map(|(i, _)| i) } } @@ -101,7 +101,7 @@ impl OrderedMap { self.entries.len() } - fn get_entry(&self, key: &T, check: |&K| -> bool) -> Option<(uint, &(K, V))> + fn get_entry_(&self, key: &T, check: |&K| -> bool) -> Option<(uint, &(K, V))> where T: PhfHash { let (g, f1, f2) = key.phf_hash(self.key); let (d1, d2) = self.disps[(g % (self.disps.len() as u32)) as uint]; @@ -116,31 +116,31 @@ impl OrderedMap { } /// Like `get`, but returns both the key and the value. - pub fn get_kv(&self, key: &T) -> Option<(&K, &V)> where T: PhfHash+Equiv { - self.get_entry(key, |k| key.equiv(k)).map(|(_, e)| (&e.0, &e.1)) + pub fn get_entry(&self, key: &T) -> Option<(&K, &V)> where T: PhfHash+Equiv { + self.get_entry_(key, |k| key.equiv(k)).map(|(_, e)| (&e.0, &e.1)) } /// Like `get`, but can operate on any type that is equivalent to a key. pub fn get_equiv(&self, key: &T) -> Option<&V> where T: PhfHash+Equiv { - self.get_entry(key, |k| key.equiv(k)).map(|(_, e)| &e.1) + self.get_entry_(key, |k| key.equiv(k)).map(|(_, e)| &e.1) } /// Like `get_key`, but can operate on any type that is equivalent to a /// key. pub fn get_key_equiv(&self, key: &T) -> Option<&K> where T: PhfHash+Equiv { - self.get_entry(key, |k| key.equiv(k)).map(|(_, e)| &e.0) + self.get_entry_(key, |k| key.equiv(k)).map(|(_, e)| &e.0) } /// Like `get_index`, but can operate on any type that is equivalent to a /// key. pub fn get_index_equiv(&self, key: &T) -> Option where T: PhfHash+Equiv { - self.get_entry(key, |k| key.equiv(k)).map(|(i, _)| i) + self.get_entry_(key, |k| key.equiv(k)).map(|(i, _)| i) } /// Like `get_kv`, but can operate on any type that is equivalent to a /// key. - pub fn get_kv_equiv(&self, key: &T) -> Option<(&K, &V)> where T: PhfHash+Equiv { - self.get_entry(key, |k| key.equiv(k)).map(|(_, e)| (&e.0, &e.1)) + pub fn get_entry_equiv(&self, key: &T) -> Option<(&K, &V)> where T: PhfHash+Equiv { + self.get_entry_(key, |k| key.equiv(k)).map(|(_, e)| (&e.0, &e.1)) } /// Returns an iterator over the key/value pairs in the map.