Test fixes and rebase conflicts

2 files changed, 6 insertions, 6 deletions

diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index 8181ea5253f..3bfe2009f8b 100644
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -1320,9 +1320,9 @@ pub struct Iter<'a, K: 'a, V: 'a> {
 }
 
 // FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
-impl<'a, K, V> Clone for Entries<'a, K, V> {
-    fn clone(&self) -> Entries<'a, K, V> {
-        Entries {
+impl<'a, K, V> Clone for Iter<'a, K, V> {
+    fn clone(&self) -> Iter<'a, K, V> {
+        Iter {
             inner: self.inner.clone()
         }
     }
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
index f5fbfcabcfb..6938ab9b0b6 100644
--- a/src/libstd/collections/hash/table.rs
+++ b/src/libstd/collections/hash/table.rs
@@ -788,9 +788,9 @@ pub struct Iter<'a, K: 'a, V: 'a> {
 }
 
 // FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
-impl<'a, K, V> Clone for Entries<'a, K, V> {
-    fn clone(&self) -> Entries<'a, K, V> {
-        Entries {
+impl<'a, K, V> Clone for Iter<'a, K, V> {
+    fn clone(&self) -> Iter<'a, K, V> {
+        Iter {
             iter: self.iter.clone(),
             elems_left: self.elems_left
         }