@@ -134,36 +134,11 @@ impl<K: TotalOrd, V> TreeMap<K, V> {
134
134
/// Create an empty TreeMap
135
135
pub fn new ( ) -> TreeMap < K , V > { TreeMap { root : None , length : 0 } }
136
136
137
- /// Visit all keys in order
138
- pub fn each_key ( & self , f : & fn ( & K ) -> bool ) -> bool {
139
- self . iter ( ) . advance ( |( k, _) | f ( k) )
140
- }
141
-
142
- /// Visit all values in order
143
- pub fn each_value < ' a > ( & ' a self , f : & fn ( & ' a V ) -> bool ) -> bool {
144
- self . iter ( ) . advance ( |( _, v) | f ( v) )
145
- }
146
-
147
137
/// Iterate over the map and mutate the contained values
148
138
pub fn mutate_values ( & mut self , f : & fn ( & K , & mut V ) -> bool ) -> bool {
149
139
mutate_values ( & mut self . root , f)
150
140
}
151
141
152
- /// Visit all key-value pairs in reverse order
153
- pub fn each_reverse < ' a > ( & ' a self , f : & fn ( & ' a K , & ' a V ) -> bool ) -> bool {
154
- self . rev_iter ( ) . advance ( |( k, v) | f ( k, v) )
155
- }
156
-
157
- /// Visit all keys in reverse order
158
- pub fn each_key_reverse ( & self , f : & fn ( & K ) -> bool ) -> bool {
159
- self . each_reverse ( |k, _| f ( k) )
160
- }
161
-
162
- /// Visit all values in reverse order
163
- pub fn each_value_reverse ( & self , f : & fn ( & V ) -> bool ) -> bool {
164
- self . each_reverse ( |_, v| f ( v) )
165
- }
166
-
167
142
/// Get a lazy iterator over the key-value pairs in the map.
168
143
/// Requires that it be frozen (immutable).
169
144
pub fn iter < ' a > ( & ' a self ) -> TreeMapIterator < ' a , K , V > {
@@ -552,12 +527,6 @@ impl<T: TotalOrd> TreeSet<T> {
552
527
TreeSetIterator { iter : self . map . upper_bound_iter ( v) }
553
528
}
554
529
555
- /// Visit all values in reverse order
556
- #[ inline]
557
- pub fn each_reverse ( & self , f : & fn ( & T ) -> bool ) -> bool {
558
- self . map . each_key_reverse ( f)
559
- }
560
-
561
530
/// Visit the values (in-order) representing the difference
562
531
pub fn difference < ' a > ( & ' a self , other : & ' a TreeSet < T > ) -> Difference < ' a , T > {
563
532
Difference { a : Focus :: new ( self . iter ( ) ) , b : Focus :: new ( other. iter ( ) ) }
@@ -1172,7 +1141,7 @@ mod test_treemap {
1172
1141
}
1173
1142
1174
1143
#[ test]
1175
- fn test_each_reverse ( ) {
1144
+ fn test_rev_iter ( ) {
1176
1145
let mut m = TreeMap :: new ( ) ;
1177
1146
1178
1147
assert ! ( m. insert( 3 , 6 ) ) ;
@@ -1182,12 +1151,11 @@ mod test_treemap {
1182
1151
assert ! ( m. insert( 1 , 2 ) ) ;
1183
1152
1184
1153
let mut n = 4 ;
1185
- do m . each_reverse | k, v| {
1154
+ for ( k, v) in m . rev_iter ( ) {
1186
1155
assert_eq ! ( * k, n) ;
1187
1156
assert_eq ! ( * v, n * 2 ) ;
1188
1157
n -= 1 ;
1189
- true
1190
- } ;
1158
+ }
1191
1159
}
1192
1160
1193
1161
#[ test]
@@ -1448,7 +1416,7 @@ mod test_set {
1448
1416
}
1449
1417
1450
1418
#[ test]
1451
- fn test_each_reverse ( ) {
1419
+ fn test_rev_iter ( ) {
1452
1420
let mut m = TreeSet :: new ( ) ;
1453
1421
1454
1422
assert ! ( m. insert( 3 ) ) ;
@@ -1458,11 +1426,10 @@ mod test_set {
1458
1426
assert ! ( m. insert( 1 ) ) ;
1459
1427
1460
1428
let mut n = 4 ;
1461
- do m . each_reverse |x| {
1429
+ for x in m . rev_iter ( ) {
1462
1430
assert_eq ! ( * x, n) ;
1463
1431
n -= 1 ;
1464
- true
1465
- } ;
1432
+ }
1466
1433
}
1467
1434
1468
1435
fn check ( a : & [ int ] , b : & [ int ] , expected : & [ int ] ,
0 commit comments