@@ -134,36 +134,11 @@ impl<K: TotalOrd, V> TreeMap<K, V> {
134134 /// Create an empty TreeMap
135135 pub fn new ( ) -> TreeMap < K , V > { TreeMap { root : None , length : 0 } }
136136
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-
147137 /// Iterate over the map and mutate the contained values
148138 pub fn mutate_values ( & mut self , f : & fn ( & K , & mut V ) -> bool ) -> bool {
149139 mutate_values ( & mut self . root , f)
150140 }
151141
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-
167142 /// Get a lazy iterator over the key-value pairs in the map.
168143 /// Requires that it be frozen (immutable).
169144 pub fn iter < ' a > ( & ' a self ) -> TreeMapIterator < ' a , K , V > {
@@ -552,12 +527,6 @@ impl<T: TotalOrd> TreeSet<T> {
552527 TreeSetIterator { iter : self . map . upper_bound_iter ( v) }
553528 }
554529
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-
561530 /// Visit the values (in-order) representing the difference
562531 pub fn difference < ' a > ( & ' a self , other : & ' a TreeSet < T > ) -> Difference < ' a , T > {
563532 Difference { a : Focus :: new ( self . iter ( ) ) , b : Focus :: new ( other. iter ( ) ) }
@@ -1172,7 +1141,7 @@ mod test_treemap {
11721141 }
11731142
11741143 #[ test]
1175- fn test_each_reverse ( ) {
1144+ fn test_rev_iter ( ) {
11761145 let mut m = TreeMap :: new ( ) ;
11771146
11781147 assert ! ( m. insert( 3 , 6 ) ) ;
@@ -1182,12 +1151,11 @@ mod test_treemap {
11821151 assert ! ( m. insert( 1 , 2 ) ) ;
11831152
11841153 let mut n = 4 ;
1185- do m . each_reverse | k, v| {
1154+ for ( k, v) in m . rev_iter ( ) {
11861155 assert_eq ! ( * k, n) ;
11871156 assert_eq ! ( * v, n * 2 ) ;
11881157 n -= 1 ;
1189- true
1190- } ;
1158+ }
11911159 }
11921160
11931161 #[ test]
@@ -1448,7 +1416,7 @@ mod test_set {
14481416 }
14491417
14501418 #[ test]
1451- fn test_each_reverse ( ) {
1419+ fn test_rev_iter ( ) {
14521420 let mut m = TreeSet :: new ( ) ;
14531421
14541422 assert ! ( m. insert( 3 ) ) ;
@@ -1458,11 +1426,10 @@ mod test_set {
14581426 assert ! ( m. insert( 1 ) ) ;
14591427
14601428 let mut n = 4 ;
1461- do m . each_reverse |x| {
1429+ for x in m . rev_iter ( ) {
14621430 assert_eq ! ( * x, n) ;
14631431 n -= 1 ;
1464- true
1465- } ;
1432+ }
14661433 }
14671434
14681435 fn check ( a : & [ int ] , b : & [ int ] , expected : & [ int ] ,
0 commit comments