mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rollup merge of #23769: alexcrichton/stabilize-split

Browse Source 
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!
This commit is contained in:
Alex Crichton 2015-03-27 10:07:51 -07:00
commit a491d21353
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libstd/io/mod.rs
View File

@ -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>>;