diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 10:07:51 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 10:07:51 -0700 |
| commit | a491d2135386a53c6e5dd4545ad46b0868ea4721 (patch) | |
| tree | ebd7883671bc938ec9550189c004a63b745fe7ae | |
| parent | 73936932e78d687e14f0129d921728b4366574d3 (diff) | |
| parent | e71221f327225f5714308a92b4f46392c5189105 (diff) | |
| download | rust-a491d2135386a53c6e5dd4545ad46b0868ea4721.tar.gz rust-a491d2135386a53c6e5dd4545ad46b0868ea4721.zip | |
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!
| -rw-r--r-- | src/libstd/io/mod.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 0ed6d07bf79..5d62f1341e3 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -609,8 +609,7 @@ pub trait BufRead: Read { /// /// This function will yield errors whenever `read_until` would have also /// yielded an error. - #[unstable(feature = "io", reason = "may be renamed to not conflict with \ - SliceExt::split")] + #[stable(feature = "rust1", since = "1.0.0")] fn split(self, byte: u8) -> Split<Self> where Self: Sized { Split { buf: self, delim: byte } } @@ -854,13 +853,13 @@ impl fmt::Display for CharsError { /// particular byte. /// /// See `BufReadExt::split` for more information. -#[unstable(feature = "io", reason = "awaiting stability of BufReadExt::split")] +#[stable(feature = "rust1", since = "1.0.0")] pub struct Split<B> { buf: B, delim: u8, } -#[unstable(feature = "io", reason = "awaiting stability of BufReadExt::split")] +#[stable(feature = "rust1", since = "1.0.0")] impl<B: BufRead> Iterator for Split<B> { type Item = Result<Vec<u8>>; |
