@@ -20,7 +20,7 @@ use cmp::{Eq, TotalEq};
20
20
use container:: Container ;
21
21
use default:: Default ;
22
22
use iter:: { Filter , Map , Iterator } ;
23
- use iter:: { Rev , DoubleEndedIterator , ExactSize } ;
23
+ use iter:: { DoubleEndedIterator , ExactSize } ;
24
24
use iter:: range;
25
25
use num:: Saturating ;
26
26
use option:: { None , Option , Some } ;
@@ -174,20 +174,11 @@ impl<'a> DoubleEndedIterator<(uint, char)> for CharOffsets<'a> {
174
174
}
175
175
}
176
176
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
-
183
177
/// External iterator for a string's bytes.
184
178
/// Use with the `std::iter` module.
185
179
pub type Bytes < ' a > =
186
180
Map < ' a , & ' a u8 , u8 , slice:: Items < ' a , u8 > > ;
187
181
188
- #[ deprecated = "replaced by Rev<Bytes<'a>>" ]
189
- pub type RevBytes < ' a > = Rev < Bytes < ' a > > ;
190
-
191
182
/// An iterator over the substrings of a string, separated by `sep`.
192
183
#[ deriving( Clone ) ]
193
184
pub struct CharSplits < ' a , Sep > {
@@ -200,9 +191,6 @@ pub struct CharSplits<'a, Sep> {
200
191
finished : bool ,
201
192
}
202
193
203
- #[ deprecated = "replaced by Rev<CharSplits<'a, Sep>>" ]
204
- pub type RevCharSplits < ' a , Sep > = Rev < CharSplits < ' a , Sep > > ;
205
-
206
194
/// An iterator over the substrings of a string, separated by `sep`,
207
195
/// splitting at most `count` times.
208
196
#[ deriving( Clone ) ]
@@ -1032,24 +1020,12 @@ pub trait StrSlice<'a> {
1032
1020
/// ```
1033
1021
fn chars ( & self ) -> Chars < ' a > ;
1034
1022
1035
- /// Do not use this - it is deprecated.
1036
- #[ deprecated = "replaced by .chars().rev()" ]
1037
- fn chars_rev ( & self ) -> Rev < Chars < ' a > > ;
1038
-
1039
1023
/// An iterator over the bytes of `self`
1040
1024
fn bytes ( & self ) -> Bytes < ' a > ;
1041
1025
1042
- /// Do not use this - it is deprecated.
1043
- #[ deprecated = "replaced by .bytes().rev()" ]
1044
- fn bytes_rev ( & self ) -> Rev < Bytes < ' a > > ;
1045
-
1046
1026
/// An iterator over the characters of `self` and their byte offsets.
1047
1027
fn char_indices ( & self ) -> CharOffsets < ' a > ;
1048
1028
1049
- /// Do not use this - it is deprecated.
1050
- #[ deprecated = "replaced by .char_indices().rev()" ]
1051
- fn char_indices_rev ( & self ) -> Rev < CharOffsets < ' a > > ;
1052
-
1053
1029
/// An iterator over substrings of `self`, separated by characters
1054
1030
/// matched by `sep`.
1055
1031
///
@@ -1120,10 +1096,6 @@ pub trait StrSlice<'a> {
1120
1096
/// ```
1121
1097
fn split_terminator < Sep : CharEq > ( & self , sep : Sep ) -> CharSplits < ' a , Sep > ;
1122
1098
1123
- /// Do not use this - it is deprecated.
1124
- #[ deprecated = "replaced by .split(sep).rev()" ]
1125
- fn rsplit < Sep : CharEq > ( & self , sep : Sep ) -> Rev < CharSplits < ' a , Sep > > ;
1126
-
1127
1099
/// An iterator over substrings of `self`, separated by characters
1128
1100
/// matched by `sep`, starting from the end of the string.
1129
1101
/// Restricted to splitting at most `count` times.
@@ -1642,34 +1614,16 @@ impl<'a> StrSlice<'a> for &'a str {
1642
1614
Chars { string : * self }
1643
1615
}
1644
1616
1645
- #[ inline]
1646
- #[ deprecated = "replaced by .chars().rev()" ]
1647
- fn chars_rev ( & self ) -> RevChars < ' a > {
1648
- self . chars ( ) . rev ( )
1649
- }
1650
-
1651
1617
#[ inline]
1652
1618
fn bytes ( & self ) -> Bytes < ' a > {
1653
1619
self . as_bytes ( ) . iter ( ) . map ( |& b| b)
1654
1620
}
1655
1621
1656
- #[ inline]
1657
- #[ deprecated = "replaced by .bytes().rev()" ]
1658
- fn bytes_rev ( & self ) -> RevBytes < ' a > {
1659
- self . bytes ( ) . rev ( )
1660
- }
1661
-
1662
1622
#[ inline]
1663
1623
fn char_indices ( & self ) -> CharOffsets < ' a > {
1664
1624
CharOffsets { string : * self , iter : self . chars ( ) }
1665
1625
}
1666
1626
1667
- #[ inline]
1668
- #[ deprecated = "replaced by .char_indices().rev()" ]
1669
- fn char_indices_rev ( & self ) -> RevCharOffsets < ' a > {
1670
- self . char_indices ( ) . rev ( )
1671
- }
1672
-
1673
1627
#[ inline]
1674
1628
fn split < Sep : CharEq > ( & self , sep : Sep ) -> CharSplits < ' a , Sep > {
1675
1629
CharSplits {
@@ -1700,12 +1654,6 @@ impl<'a> StrSlice<'a> for &'a str {
1700
1654
}
1701
1655
}
1702
1656
1703
- #[ inline]
1704
- #[ deprecated = "replaced by .split(sep).rev()" ]
1705
- fn rsplit < Sep : CharEq > ( & self , sep : Sep ) -> RevCharSplits < ' a , Sep > {
1706
- self . split ( sep) . rev ( )
1707
- }
1708
-
1709
1657
#[ inline]
1710
1658
fn rsplitn < Sep : CharEq > ( & self , sep : Sep , count : uint )
1711
1659
-> CharSplitsN < ' a , Sep > {
0 commit comments