Rename Set and OrderedSet iterators

They're now in line with RFC 344
rust-phf · Dec 15, 2014 · 9103fc5 · 9103fc5
1 parent fc4829a
commit 9103fc5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/phf/src/ordered_set.rs b/phf/src/ordered_set.rs
@@ -85,8 +85,8 @@ impl<T> OrderedSet<T> {
     /// Returns an iterator over the values in the set.
     ///
     /// Values are returned in the same order in which they were defined.
-    pub fn iter<'a>(&'a self) -> Entries<'a, T> {
-        Entries { iter: self.map.keys() }
+    pub fn iter<'a>(&'a self) -> Iter<'a, T> {
+        Iter { iter: self.map.keys() }
     }
 }
 
@@ -111,11 +111,11 @@ impl<T> OrderedSet<T> where T: Eq + PhfHash {
 }
 
 /// An iterator over the values in a `OrderedSet`.
-pub struct Entries<'a, T:'a> {
+pub struct Iter<'a, T:'a> {
     iter: ordered_map::Keys<'a, T, ()>,
 }
 
-impl<'a, T> Iterator<&'a T> for Entries<'a, T> {
+impl<'a, T> Iterator<&'a T> for Iter<'a, T> {
     #[inline]
     fn next(&mut self) -> Option<&'a T> {
         self.iter.next()
@@ -127,14 +127,14 @@ impl<'a, T> Iterator<&'a T> for Entries<'a, T> {
     }
 }
 
-impl<'a, T> DoubleEndedIterator<&'a T> for Entries<'a, T> {
+impl<'a, T> DoubleEndedIterator<&'a T> for Iter<'a, T> {
     #[inline]
     fn next_back(&mut self) -> Option<&'a T> {
         self.iter.next_back()
     }
 }
 
-impl<'a, T> RandomAccessIterator<&'a T> for Entries<'a, T> {
+impl<'a, T> RandomAccessIterator<&'a T> for Iter<'a, T> {
     #[inline]
     fn indexable(&self) -> uint {
         self.iter.indexable()
@@ -146,5 +146,5 @@ impl<'a, T> RandomAccessIterator<&'a T> for Entries<'a, T> {
     }
 }
 
-impl<'a, T> ExactSizeIterator<&'a T> for Entries<'a, T> {}
+impl<'a, T> ExactSizeIterator<&'a T> for Iter<'a, T> {}
 
diff --git a/phf/src/set.rs b/phf/src/set.rs
@@ -77,8 +77,8 @@ impl<T> Set<T> {
     /// Returns an iterator over the values in the set.
     ///
     /// Values are returned in an arbitrary but fixed order.
-    pub fn iter<'a>(&'a self) -> Items<'a, T> {
-        Items { iter: self.map.keys() }
+    pub fn iter<'a>(&'a self) -> Iter<'a, T> {
+        Iter { iter: self.map.keys() }
     }
 }
 
@@ -100,11 +100,11 @@ impl<T> Set<T> where T: Eq + PhfHash {
 }
 
 /// An iterator over the values in a `Set`.
-pub struct Items<'a, T:'static> {
+pub struct Iter<'a, T:'static> {
     iter: map::Keys<'a, T, ()>,
 }
 
-impl<'a, T> Iterator<&'a T> for Items<'a, T> {
+impl<'a, T> Iterator<&'a T> for Iter<'a, T> {
     fn next(&mut self) -> Option<&'a T> {
         self.iter.next()
     }
@@ -114,12 +114,10 @@ impl<'a, T> Iterator<&'a T> for Items<'a, T> {
     }
 }
 
-impl<'a, T> DoubleEndedIterator<&'a T> for Items<'a, T> {
+impl<'a, T> DoubleEndedIterator<&'a T> for Iter<'a, T> {
     fn next_back(&mut self) -> Option<&'a T> {
         self.iter.next_back()
     }
 }
 
-impl<'a, T> ExactSizeIterator<&'a T> for Items<'a, T> {}
-
-
+impl<'a, T> ExactSizeIterator<&'a T> for Iter<'a, T> {}