@@ -896,8 +896,8 @@ impl<K: Eq + Hash<S>, V, S, H: Hasher<S>> HashMap<K, V, H> {
896
896
/// }
897
897
/// ```
898
898
#[ unstable = "matches collection reform specification, waiting for dust to settle" ]
899
- pub fn iter ( & self ) -> Entries < K , V > {
900
- Entries { inner : self . table . iter ( ) }
899
+ pub fn iter ( & self ) -> Iter < K , V > {
900
+ Iter { inner : self . table . iter ( ) }
901
901
}
902
902
903
903
/// An iterator visiting all key-value pairs in arbitrary order,
@@ -1313,8 +1313,8 @@ impl<K: Hash<S> + Eq, Sized? Q, V, S, H: Hasher<S>> IndexMut<Q, V> for HashMap<K
1313
1313
}
1314
1314
1315
1315
/// HashMap iterator
1316
- pub struct Entries < ' a , K : ' a , V : ' a > {
1317
- inner : table:: Entries < ' a , K , V >
1316
+ pub struct Iter < ' a , K : ' a , V : ' a > {
1317
+ inner : table:: Iter < ' a , K , V >
1318
1318
}
1319
1319
1320
1320
/// HashMap mutable values iterator
@@ -1334,12 +1334,12 @@ pub struct IntoIter<K, V> {
1334
1334
1335
1335
/// HashMap keys iterator
1336
1336
pub struct Keys < ' a , K : ' a , V : ' a > {
1337
- inner : Map < ( & ' a K , & ' a V ) , & ' a K , Entries < ' a , K , V > , fn ( ( & ' a K , & ' a V ) ) -> & ' a K >
1337
+ inner : Map < ( & ' a K , & ' a V ) , & ' a K , Iter < ' a , K , V > , fn ( ( & ' a K , & ' a V ) ) -> & ' a K >
1338
1338
}
1339
1339
1340
1340
/// HashMap values iterator
1341
1341
pub struct Values < ' a , K : ' a , V : ' a > {
1342
- inner : Map < ( & ' a K , & ' a V ) , & ' a V , Entries < ' a , K , V > , fn ( ( & ' a K , & ' a V ) ) -> & ' a V >
1342
+ inner : Map < ( & ' a K , & ' a V ) , & ' a V , Iter < ' a , K , V > , fn ( ( & ' a K , & ' a V ) ) -> & ' a V >
1343
1343
}
1344
1344
1345
1345
/// HashMap drain iterator
@@ -1381,7 +1381,7 @@ enum VacantEntryState<K, V, M> {
1381
1381
NoElem ( EmptyBucket < K , V , M > ) ,
1382
1382
}
1383
1383
1384
- impl < ' a , K , V > Iterator < ( & ' a K , & ' a V ) > for Entries < ' a , K , V > {
1384
+ impl < ' a , K , V > Iterator < ( & ' a K , & ' a V ) > for Iter < ' a , K , V > {
1385
1385
#[ inline] fn next ( & mut self ) -> Option < ( & ' a K , & ' a V ) > { self . inner . next ( ) }
1386
1386
#[ inline] fn size_hint ( & self ) -> ( uint , Option < uint > ) { self . inner . size_hint ( ) }
1387
1387
}
0 commit comments