From 2f75f5fed1579c1f26c42f8a263977fcec50f749 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 11 Sep 2014 21:20:44 -0700 Subject: [PATCH] Minor cleanup --- phf/src/lib.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/phf/src/lib.rs b/phf/src/lib.rs index 175500c7..0e142c43 100644 --- a/phf/src/lib.rs +++ b/phf/src/lib.rs @@ -276,7 +276,7 @@ impl Collection for PhfSet { } } -impl<'a, T> Set for PhfSet where T: PhfHash+Eq { +impl Set for PhfSet where T: PhfHash+Eq { #[inline] fn contains(&self, value: &T) -> bool { self.map.contains_key(value) @@ -486,9 +486,7 @@ impl PhfOrderedMap { where T: PhfHash+Equiv { self.find_entry(key, |k| key.equiv(k)).map(|(i, _)| i) } -} -impl PhfOrderedMap { /// Returns an iterator over the key/value pairs in the map. /// /// Entries are retuned in the same order in which they were defined. @@ -526,15 +524,13 @@ impl<'a, K, V> Iterator<&'a (K, V)> for PhfOrderedMapEntries<'a, K, V> { } } -impl<'a, K, V> DoubleEndedIterator<&'a (K, V)> - for PhfOrderedMapEntries<'a, K, V> { +impl<'a, K, V> DoubleEndedIterator<&'a (K, V)> for PhfOrderedMapEntries<'a, K, V> { fn next_back(&mut self) -> Option<&'a (K, V)> { self.iter.next_back() } } -impl<'a, K, V> RandomAccessIterator<&'a (K, V)> - for PhfOrderedMapEntries<'a, K, V> { +impl<'a, K, V> RandomAccessIterator<&'a (K, V)> for PhfOrderedMapEntries<'a, K, V> { fn indexable(&self) -> uint { self.iter.indexable() } @@ -718,8 +714,7 @@ impl PhfOrderedSet { /// Like `find_index`, but can operate on any type that is equivalent to a /// key. - pub fn find_index_equiv(&self, key: &U) -> Option - where U: PhfHash+Equiv { + pub fn find_index_equiv(&self, key: &U) -> Option where U: PhfHash+Equiv { self.map.find_index_equiv(key) }