Merge pull request #31 from jamesrhurst/exactsize

ExactSize is now ExactSizeIterator
rust-phf · Nov 27, 2014 · d20c311 · d20c311
2 parents 4ad2bb2 + 6a7cc6e
commit d20c311
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/phf/src/map.rs b/phf/src/map.rs
@@ -146,7 +146,7 @@ impl<'a, K, V> DoubleEndedIterator<&'a (K, V)> for Entries<'a, K, V> {
     }
 }
 
-impl<'a, K, V> ExactSize<&'a (K, V)> for Entries<'a, K, V> {}
+impl<'a, K, V> ExactSizeIterator<&'a (K, V)> for Entries<'a, K, V> {}
 
 /// An iterator over the keys in a `Map`.
 pub struct Keys<'a, K:'a, V:'a> {
@@ -169,7 +169,7 @@ impl<'a, K, V> DoubleEndedIterator<&'a K> for Keys<'a, K, V> {
     }
 }
 
-impl<'a, K, V> ExactSize<&'a K> for Keys<'a, K, V> {}
+impl<'a, K, V> ExactSizeIterator<&'a K> for Keys<'a, K, V> {}
 
 /// An iterator over the values in a `Map`.
 pub struct Values<'a, K:'a, V:'a> {
@@ -192,4 +192,4 @@ impl<'a, K, V> DoubleEndedIterator<&'a V> for Values<'a, K, V> {
     }
 }
 
-impl<'a, K, V> ExactSize<&'a V> for Values<'a, K, V> {}
+impl<'a, K, V> ExactSizeIterator<&'a V> for Values<'a, K, V> {}
diff --git a/phf/src/ordered_map.rs b/phf/src/ordered_map.rs
@@ -175,7 +175,7 @@ impl<'a, K, V> RandomAccessIterator<&'a (K, V)> for Entries<'a, K, V> {
     }
 }
 
-impl<'a, K, V> ExactSize<&'a (K, V)> for Entries<'a, K, V> {}
+impl<'a, K, V> ExactSizeIterator<&'a (K, V)> for Entries<'a, K, V> {}
 
 /// An iterator over the keys in a `OrderedMap`.
 pub struct Keys<'a, K:'a, V:'a> {
@@ -208,7 +208,7 @@ impl<'a, K, V> RandomAccessIterator<&'a K> for Keys<'a, K, V> {
     }
 }
 
-impl<'a, K, V> ExactSize<&'a K> for Keys<'a, K, V> {}
+impl<'a, K, V> ExactSizeIterator<&'a K> for Keys<'a, K, V> {}
 
 /// An iterator over the values in a `OrderedMap`.
 pub struct Values<'a, K:'a, V:'a> {
@@ -241,4 +241,4 @@ impl<'a, K, V> RandomAccessIterator<&'a V> for Values<'a, K, V> {
     }
 }
 
-impl<'a, K, V> ExactSize<&'a V> for Values<'a, K, V> {}
+impl<'a, K, V> ExactSizeIterator<&'a V> for Values<'a, K, V> {}
diff --git a/phf/src/ordered_set.rs b/phf/src/ordered_set.rs
@@ -146,5 +146,5 @@ impl<'a, T> RandomAccessIterator<&'a T> for Entries<'a, T> {
     }
 }
 
-impl<'a, T> ExactSize<&'a T> for Entries<'a, T> {}
+impl<'a, T> ExactSizeIterator<&'a T> for Entries<'a, T> {}
 
diff --git a/phf/src/set.rs b/phf/src/set.rs
@@ -120,6 +120,6 @@ impl<'a, T> DoubleEndedIterator<&'a T> for Items<'a, T> {
     }
 }
 
-impl<'a, T> ExactSize<&'a T> for Items<'a, T> {}
+impl<'a, T> ExactSizeIterator<&'a T> for Items<'a, T> {}