@@ -20,7 +20,7 @@ use cmp::{Eq, TotalEq};
2020use container:: Container ;
2121use default:: Default ;
2222use iter:: { Filter , Map , Iterator } ;
23- use iter:: { Rev , DoubleEndedIterator , ExactSize } ;
23+ use iter:: { DoubleEndedIterator , ExactSize } ;
2424use iter:: range;
2525use num:: Saturating ;
2626use option:: { None , Option , Some } ;
@@ -174,20 +174,11 @@ impl<'a> DoubleEndedIterator<(uint, char)> for CharOffsets<'a> {
174174 }
175175}
176176
177- #[ deprecated = "replaced by Rev<Chars<'a>>" ]
178- pub type RevChars < ' a > = Rev < Chars < ' a > > ;
179-
180- #[ deprecated = "replaced by Rev<CharOffsets<'a>>" ]
181- pub type RevCharOffsets < ' a > = Rev < CharOffsets < ' a > > ;
182-
183177/// External iterator for a string's bytes.
184178/// Use with the `std::iter` module.
185179pub type Bytes < ' a > =
186180 Map < ' a , & ' a u8 , u8 , slice:: Items < ' a , u8 > > ;
187181
188- #[ deprecated = "replaced by Rev<Bytes<'a>>" ]
189- pub type RevBytes < ' a > = Rev < Bytes < ' a > > ;
190-
191182/// An iterator over the substrings of a string, separated by `sep`.
192183#[ deriving( Clone ) ]
193184pub struct CharSplits < ' a , Sep > {
@@ -200,9 +191,6 @@ pub struct CharSplits<'a, Sep> {
200191 finished : bool ,
201192}
202193
203- #[ deprecated = "replaced by Rev<CharSplits<'a, Sep>>" ]
204- pub type RevCharSplits < ' a , Sep > = Rev < CharSplits < ' a , Sep > > ;
205-
206194/// An iterator over the substrings of a string, separated by `sep`,
207195/// splitting at most `count` times.
208196#[ deriving( Clone ) ]
@@ -1080,24 +1068,12 @@ pub trait StrSlice<'a> {
10801068 /// ```
10811069 fn chars ( & self ) -> Chars < ' a > ;
10821070
1083- /// Do not use this - it is deprecated.
1084- #[ deprecated = "replaced by .chars().rev()" ]
1085- fn chars_rev ( & self ) -> Rev < Chars < ' a > > ;
1086-
10871071 /// An iterator over the bytes of `self`
10881072 fn bytes ( & self ) -> Bytes < ' a > ;
10891073
1090- /// Do not use this - it is deprecated.
1091- #[ deprecated = "replaced by .bytes().rev()" ]
1092- fn bytes_rev ( & self ) -> Rev < Bytes < ' a > > ;
1093-
10941074 /// An iterator over the characters of `self` and their byte offsets.
10951075 fn char_indices ( & self ) -> CharOffsets < ' a > ;
10961076
1097- /// Do not use this - it is deprecated.
1098- #[ deprecated = "replaced by .char_indices().rev()" ]
1099- fn char_indices_rev ( & self ) -> Rev < CharOffsets < ' a > > ;
1100-
11011077 /// An iterator over substrings of `self`, separated by characters
11021078 /// matched by `sep`.
11031079 ///
@@ -1159,10 +1135,6 @@ pub trait StrSlice<'a> {
11591135 /// ```
11601136 fn split_terminator < Sep : CharEq > ( & self , sep : Sep ) -> CharSplits < ' a , Sep > ;
11611137
1162- /// Do not use this - it is deprecated.
1163- #[ deprecated = "replaced by .split(sep).rev()" ]
1164- fn rsplit < Sep : CharEq > ( & self , sep : Sep ) -> Rev < CharSplits < ' a , Sep > > ;
1165-
11661138 /// An iterator over substrings of `self`, separated by characters
11671139 /// matched by `sep`, starting from the end of the string.
11681140 /// Restricted to splitting at most `count` times.
@@ -1681,34 +1653,16 @@ impl<'a> StrSlice<'a> for &'a str {
16811653 Chars { string : * self }
16821654 }
16831655
1684- #[ inline]
1685- #[ deprecated = "replaced by .chars().rev()" ]
1686- fn chars_rev ( & self ) -> RevChars < ' a > {
1687- self . chars ( ) . rev ( )
1688- }
1689-
16901656 #[ inline]
16911657 fn bytes ( & self ) -> Bytes < ' a > {
16921658 self . as_bytes ( ) . iter ( ) . map ( |& b| b)
16931659 }
16941660
1695- #[ inline]
1696- #[ deprecated = "replaced by .bytes().rev()" ]
1697- fn bytes_rev ( & self ) -> RevBytes < ' a > {
1698- self . bytes ( ) . rev ( )
1699- }
1700-
17011661 #[ inline]
17021662 fn char_indices ( & self ) -> CharOffsets < ' a > {
17031663 CharOffsets { string : * self , iter : self . chars ( ) }
17041664 }
17051665
1706- #[ inline]
1707- #[ deprecated = "replaced by .char_indices().rev()" ]
1708- fn char_indices_rev ( & self ) -> RevCharOffsets < ' a > {
1709- self . char_indices ( ) . rev ( )
1710- }
1711-
17121666 #[ inline]
17131667 fn split < Sep : CharEq > ( & self , sep : Sep ) -> CharSplits < ' a , Sep > {
17141668 CharSplits {
@@ -1739,12 +1693,6 @@ impl<'a> StrSlice<'a> for &'a str {
17391693 }
17401694 }
17411695
1742- #[ inline]
1743- #[ deprecated = "replaced by .split(sep).rev()" ]
1744- fn rsplit < Sep : CharEq > ( & self , sep : Sep ) -> RevCharSplits < ' a , Sep > {
1745- self . split ( sep) . rev ( )
1746- }
1747-
17481696 #[ inline]
17491697 fn rsplitn < Sep : CharEq > ( & self , sep : Sep , count : uint )
17501698 -> CharSplitsN < ' a , Sep > {
0 commit comments