Skip to content

Commit a491d21

Browse files
committed
rollup merge of #23769: alexcrichton/stabilize-split
Now that `<[_]>::split` is an inherent method, it will trump `BufRead::split` when `BufRead` is in scope, so there is no longer a conflict. As a result, calling `slice.split()` will probably always give you precisely what you want!
2 parents 7393693 + e71221f commit a491d21

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/libstd/io/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,7 @@ pub trait BufRead: Read {
609609
///
610610
/// This function will yield errors whenever `read_until` would have also
611611
/// yielded an error.
612-
#[unstable(feature = "io", reason = "may be renamed to not conflict with \
613-
SliceExt::split")]
612+
#[stable(feature = "rust1", since = "1.0.0")]
614613
fn split(self, byte: u8) -> Split<Self> where Self: Sized {
615614
Split { buf: self, delim: byte }
616615
}
@@ -854,13 +853,13 @@ impl fmt::Display for CharsError {
854853
/// particular byte.
855854
///
856855
/// See `BufReadExt::split` for more information.
857-
#[unstable(feature = "io", reason = "awaiting stability of BufReadExt::split")]
856+
#[stable(feature = "rust1", since = "1.0.0")]
858857
pub struct Split<B> {
859858
buf: B,
860859
delim: u8,
861860
}
862861

863-
#[unstable(feature = "io", reason = "awaiting stability of BufReadExt::split")]
862+
#[stable(feature = "rust1", since = "1.0.0")]
864863
impl<B: BufRead> Iterator for Split<B> {
865864
type Item = Result<Vec<u8>>;
866865

0 commit comments

Comments
 (0)