@@ -670,7 +670,7 @@ pub trait DoubleEndedIterator<A>: Iterator<A> {
670670 /// Yield an element from the end of the range, returning `None` if the range is empty.
671671 fn next_back ( & mut self ) -> Option < A > ;
672672
673- /// Flip the direction of the iterator
673+ /// Change the direction of the iterator
674674 ///
675675 /// The flipped iterator swaps the ends on an iterator that can already
676676 /// be iterated from the front and from the back.
@@ -683,8 +683,8 @@ pub trait DoubleEndedIterator<A>: Iterator<A> {
683683 /// Note: Random access with flipped indices still only applies to the first
684684 /// `uint::max_value` elements of the original iterator.
685685 #[ inline]
686- fn flip ( self ) -> Flip < Self > {
687- Flip { iter : self }
686+ fn rev ( self ) -> Rev < Self > {
687+ Rev { iter : self }
688688 }
689689}
690690
@@ -759,30 +759,30 @@ pub trait ExactSize<A> : DoubleEndedIterator<A> {
759759// Adaptors that may overflow in `size_hint` are not, i.e. `Chain`.
760760impl < A , T : ExactSize < A > > ExactSize < ( uint , A ) > for Enumerate < T > { }
761761impl < ' a , A , T : ExactSize < A > > ExactSize < A > for Inspect < ' a , A , T > { }
762- impl < A , T : ExactSize < A > > ExactSize < A > for Flip < T > { }
762+ impl < A , T : ExactSize < A > > ExactSize < A > for Rev < T > { }
763763impl < ' a , A , B , T : ExactSize < A > > ExactSize < B > for Map < ' a , A , B , T > { }
764764impl < A , B , T : ExactSize < A > , U : ExactSize < B > > ExactSize < ( A , B ) > for Zip < T , U > { }
765765
766766/// An double-ended iterator with the direction inverted
767767#[ deriving( Clone ) ]
768- pub struct Flip < T > {
768+ pub struct Rev < T > {
769769 priv iter : T
770770}
771771
772- impl < A , T : DoubleEndedIterator < A > > Iterator < A > for Flip < T > {
772+ impl < A , T : DoubleEndedIterator < A > > Iterator < A > for Rev < T > {
773773 #[ inline]
774774 fn next ( & mut self ) -> Option < A > { self . iter . next_back ( ) }
775775 #[ inline]
776776 fn size_hint ( & self ) -> ( uint , Option < uint > ) { self . iter . size_hint ( ) }
777777}
778778
779- impl < A , T : DoubleEndedIterator < A > > DoubleEndedIterator < A > for Flip < T > {
779+ impl < A , T : DoubleEndedIterator < A > > DoubleEndedIterator < A > for Rev < T > {
780780 #[ inline]
781781 fn next_back ( & mut self ) -> Option < A > { self . iter . next ( ) }
782782}
783783
784784impl < A , T : DoubleEndedIterator < A > + RandomAccessIterator < A > > RandomAccessIterator < A >
785- for Flip < T > {
785+ for Rev < T > {
786786 #[ inline]
787787 fn indexable ( & self ) -> uint { self . iter . indexable ( ) }
788788 #[ inline]
@@ -2590,12 +2590,12 @@ mod tests {
25902590 }
25912591
25922592 #[ test]
2593- fn test_flip ( ) {
2593+ fn test_rev ( ) {
25942594 let xs = [ 2 , 4 , 6 , 8 , 10 , 12 , 14 , 16 ] ;
25952595 let mut it = xs. iter ( ) ;
25962596 it. next ( ) ;
25972597 it. next ( ) ;
2598- assert_eq ! ( it. flip ( ) . map( |& x| x) . collect:: <~[ int] >( ) , ~[ 16 , 14 , 12 , 10 , 8 , 6 ] ) ;
2598+ assert_eq ! ( it. rev ( ) . map( |& x| x) . collect:: <~[ int] >( ) , ~[ 16 , 14 , 12 , 10 , 8 , 6 ] ) ;
25992599 }
26002600
26012601 #[ test]
@@ -2662,7 +2662,7 @@ mod tests {
26622662 fn test_double_ended_chain ( ) {
26632663 let xs = [ 1 , 2 , 3 , 4 , 5 ] ;
26642664 let ys = ~[ 7 , 9 , 11 ] ;
2665- let mut it = xs. iter ( ) . chain ( ys. iter ( ) ) . flip ( ) ;
2665+ let mut it = xs. iter ( ) . chain ( ys. iter ( ) ) . rev ( ) ;
26662666 assert_eq ! ( it. next( ) . unwrap( ) , & 11 )
26672667 assert_eq ! ( it. next( ) . unwrap( ) , & 9 )
26682668 assert_eq ! ( it. next_back( ) . unwrap( ) , & 1 )
@@ -2764,10 +2764,10 @@ mod tests {
27642764 }
27652765
27662766 #[ test]
2767- fn test_random_access_flip ( ) {
2767+ fn test_random_access_rev ( ) {
27682768 let xs = [ 1 , 2 , 3 , 4 , 5 ] ;
2769- check_randacc_iter ( xs. iter ( ) . flip ( ) , xs. len ( ) ) ;
2770- let mut it = xs. iter ( ) . flip ( ) ;
2769+ check_randacc_iter ( xs. iter ( ) . rev ( ) , xs. len ( ) ) ;
2770+ let mut it = xs. iter ( ) . rev ( ) ;
27712771 it. next ( ) ;
27722772 it. next_back ( ) ;
27732773 it. next ( ) ;
@@ -2833,13 +2833,13 @@ mod tests {
28332833
28342834 #[ test]
28352835 fn test_double_ended_range ( ) {
2836- assert_eq ! ( range( 11 i, 14 ) . flip ( ) . collect:: <~[ int] >( ) , ~[ 13 i, 12 , 11 ] ) ;
2837- for _ in range ( 10 i, 0 ) . flip ( ) {
2836+ assert_eq ! ( range( 11 i, 14 ) . rev ( ) . collect:: <~[ int] >( ) , ~[ 13 i, 12 , 11 ] ) ;
2837+ for _ in range ( 10 i, 0 ) . rev ( ) {
28382838 fail ! ( "unreachable" ) ;
28392839 }
28402840
2841- assert_eq ! ( range( 11 u, 14 ) . flip ( ) . collect:: <~[ uint] >( ) , ~[ 13 u, 12 , 11 ] ) ;
2842- for _ in range ( 10 u, 0 ) . flip ( ) {
2841+ assert_eq ! ( range( 11 u, 14 ) . rev ( ) . collect:: <~[ uint] >( ) , ~[ 13 u, 12 , 11 ] ) ;
2842+ for _ in range ( 10 u, 0 ) . rev ( ) {
28432843 fail ! ( "unreachable" ) ;
28442844 }
28452845 }
@@ -2886,11 +2886,11 @@ mod tests {
28862886
28872887 assert_eq ! ( range( 0 i, 5 ) . collect:: <~[ int] >( ) , ~[ 0 i, 1 , 2 , 3 , 4 ] ) ;
28882888 assert_eq ! ( range( -10 i, -1 ) . collect:: <~[ int] >( ) , ~[ -10 , -9 , -8 , -7 , -6 , -5 , -4 , -3 , -2 ] ) ;
2889- assert_eq ! ( range( 0 i, 5 ) . flip ( ) . collect:: <~[ int] >( ) , ~[ 4 , 3 , 2 , 1 , 0 ] ) ;
2889+ assert_eq ! ( range( 0 i, 5 ) . rev ( ) . collect:: <~[ int] >( ) , ~[ 4 , 3 , 2 , 1 , 0 ] ) ;
28902890 assert_eq ! ( range( 200 , -5 ) . collect:: <~[ int] >( ) , ~[ ] ) ;
2891- assert_eq ! ( range( 200 , -5 ) . flip ( ) . collect:: <~[ int] >( ) , ~[ ] ) ;
2891+ assert_eq ! ( range( 200 , -5 ) . rev ( ) . collect:: <~[ int] >( ) , ~[ ] ) ;
28922892 assert_eq ! ( range( 200 , 200 ) . collect:: <~[ int] >( ) , ~[ ] ) ;
2893- assert_eq ! ( range( 200 , 200 ) . flip ( ) . collect:: <~[ int] >( ) , ~[ ] ) ;
2893+ assert_eq ! ( range( 200 , 200 ) . rev ( ) . collect:: <~[ int] >( ) , ~[ ] ) ;
28942894
28952895 assert_eq ! ( range( 0 i, 100 ) . size_hint( ) , ( 100 , Some ( 100 ) ) ) ;
28962896 // this test is only meaningful when sizeof uint < sizeof u64
@@ -2902,11 +2902,11 @@ mod tests {
29022902 #[ test]
29032903 fn test_range_inclusive ( ) {
29042904 assert_eq ! ( range_inclusive( 0 i, 5 ) . collect:: <~[ int] >( ) , ~[ 0 i, 1 , 2 , 3 , 4 , 5 ] ) ;
2905- assert_eq ! ( range_inclusive( 0 i, 5 ) . flip ( ) . collect:: <~[ int] >( ) , ~[ 5 i, 4 , 3 , 2 , 1 , 0 ] ) ;
2905+ assert_eq ! ( range_inclusive( 0 i, 5 ) . rev ( ) . collect:: <~[ int] >( ) , ~[ 5 i, 4 , 3 , 2 , 1 , 0 ] ) ;
29062906 assert_eq ! ( range_inclusive( 200 , -5 ) . collect:: <~[ int] >( ) , ~[ ] ) ;
2907- assert_eq ! ( range_inclusive( 200 , -5 ) . flip ( ) . collect:: <~[ int] >( ) , ~[ ] ) ;
2907+ assert_eq ! ( range_inclusive( 200 , -5 ) . rev ( ) . collect:: <~[ int] >( ) , ~[ ] ) ;
29082908 assert_eq ! ( range_inclusive( 200 , 200 ) . collect:: <~[ int] >( ) , ~[ 200 ] ) ;
2909- assert_eq ! ( range_inclusive( 200 , 200 ) . flip ( ) . collect:: <~[ int] >( ) , ~[ 200 ] ) ;
2909+ assert_eq ! ( range_inclusive( 200 , 200 ) . rev ( ) . collect:: <~[ int] >( ) , ~[ 200 ] ) ;
29102910 }
29112911
29122912 #[ test]
0 commit comments