diff --git a/buffered.rs b/buffered.rs index 7001d8e..8e5daa4 100644 --- a/buffered.rs +++ b/buffered.rs @@ -10,13 +10,13 @@ //! Buffering wrappers for I/O traits +use core::prelude::v1::*; use io::prelude::*; -use cmp; -use error; -use fmt; +use core::cmp; +use core::fmt; use io::{self, Initializer, DEFAULT_BUF_SIZE, Error, ErrorKind, SeekFrom}; -use memchr; +use io::memchr; /// The `BufReader` struct adds buffering to any reader. /// @@ -46,7 +46,6 @@ use memchr; /// # Ok(()) /// # } /// ``` -#[stable(feature = "rust1", since = "1.0.0")] pub struct BufReader { inner: R, buf: Box<[u8]>, @@ -69,7 +68,6 @@ impl BufReader { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn new(inner: R) -> BufReader { BufReader::with_capacity(DEFAULT_BUF_SIZE, inner) } @@ -90,7 +88,6 @@ impl BufReader { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn with_capacity(cap: usize, inner: R) -> BufReader { unsafe { let mut buffer = Vec::with_capacity(cap); @@ -123,7 +120,6 @@ impl BufReader { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn get_ref(&self) -> &R { &self.inner } /// Gets a mutable reference to the underlying reader. @@ -144,7 +140,6 @@ impl BufReader { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn get_mut(&mut self) -> &mut R { &mut self.inner } /// Returns `true` if there are no bytes in the internal buffer. @@ -167,7 +162,6 @@ impl BufReader { /// # Ok(()) /// # } /// ``` - #[unstable(feature = "bufreader_is_empty", issue = "45323", reason = "recently added")] pub fn is_empty(&self) -> bool { self.pos == self.cap } @@ -190,11 +184,9 @@ impl BufReader { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn into_inner(self) -> R { self.inner } } -#[stable(feature = "rust1", since = "1.0.0")] impl Read for BufReader { fn read(&mut self, buf: &mut [u8]) -> io::Result { // If we don't have any buffered data and we're doing a massive read @@ -217,7 +209,6 @@ impl Read for BufReader { } } -#[stable(feature = "rust1", since = "1.0.0")] impl BufRead for BufReader { fn fill_buf(&mut self) -> io::Result<&[u8]> { // If we've reached the end of our internal buffer then we need to fetch @@ -237,7 +228,6 @@ impl BufRead for BufReader { } } -#[stable(feature = "rust1", since = "1.0.0")] impl fmt::Debug for BufReader where R: fmt::Debug { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fmt.debug_struct("BufReader") @@ -247,7 +237,6 @@ impl fmt::Debug for BufReader where R: fmt::Debug { } } -#[stable(feature = "rust1", since = "1.0.0")] impl Seek for BufReader { /// Seek to an offset, in bytes, in the underlying reader. /// @@ -345,7 +334,6 @@ impl Seek for BufReader { /// [`Tcpstream::write`]: ../../std/net/struct.TcpStream.html#method.write /// [`TcpStream`]: ../../std/net/struct.TcpStream.html /// [`flush`]: #method.flush -#[stable(feature = "rust1", since = "1.0.0")] pub struct BufWriter { inner: Option, buf: Vec, @@ -380,7 +368,6 @@ pub struct BufWriter { /// }; /// ``` #[derive(Debug)] -#[stable(feature = "rust1", since = "1.0.0")] pub struct IntoInnerError(W, Error); impl BufWriter { @@ -394,7 +381,6 @@ impl BufWriter { /// /// let mut buffer = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap()); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn new(inner: W) -> BufWriter { BufWriter::with_capacity(DEFAULT_BUF_SIZE, inner) } @@ -412,7 +398,6 @@ impl BufWriter { /// let stream = TcpStream::connect("127.0.0.1:34254").unwrap(); /// let mut buffer = BufWriter::with_capacity(100, stream); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn with_capacity(cap: usize, inner: W) -> BufWriter { BufWriter { inner: Some(inner), @@ -461,7 +446,6 @@ impl BufWriter { /// // we can use reference just like buffer /// let reference = buffer.get_ref(); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn get_ref(&self) -> &W { self.inner.as_ref().unwrap() } /// Gets a mutable reference to the underlying writer. @@ -479,7 +463,6 @@ impl BufWriter { /// // we can use reference just like buffer /// let reference = buffer.get_mut(); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn get_mut(&mut self) -> &mut W { self.inner.as_mut().unwrap() } /// Unwraps this `BufWriter`, returning the underlying writer. @@ -501,7 +484,6 @@ impl BufWriter { /// // unwrap the TcpStream and flush the buffer /// let stream = buffer.into_inner().unwrap(); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn into_inner(mut self) -> Result>> { match self.flush_buf() { Err(e) => Err(IntoInnerError(self, e)), @@ -510,7 +492,6 @@ impl BufWriter { } } -#[stable(feature = "rust1", since = "1.0.0")] impl Write for BufWriter { fn write(&mut self, buf: &[u8]) -> io::Result { if self.buf.len() + buf.len() > self.buf.capacity() { @@ -530,7 +511,6 @@ impl Write for BufWriter { } } -#[stable(feature = "rust1", since = "1.0.0")] impl fmt::Debug for BufWriter where W: fmt::Debug { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fmt.debug_struct("BufWriter") @@ -540,7 +520,6 @@ impl fmt::Debug for BufWriter where W: fmt::Debug { } } -#[stable(feature = "rust1", since = "1.0.0")] impl Seek for BufWriter { /// Seek to the offset, in bytes, in the underlying writer. /// @@ -550,7 +529,6 @@ impl Seek for BufWriter { } } -#[stable(feature = "rust1", since = "1.0.0")] impl Drop for BufWriter { fn drop(&mut self) { if self.inner.is_some() && !self.panicked { @@ -589,7 +567,6 @@ impl IntoInnerError { /// } /// }; /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn error(&self) -> &Error { &self.1 } /// Returns the buffered writer instance which generated the error. @@ -622,23 +599,13 @@ impl IntoInnerError { /// } /// }; /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn into_inner(self) -> W { self.0 } } -#[stable(feature = "rust1", since = "1.0.0")] impl From> for Error { fn from(iie: IntoInnerError) -> Error { iie.1 } } -#[stable(feature = "rust1", since = "1.0.0")] -impl error::Error for IntoInnerError { - fn description(&self) -> &str { - error::Error::description(self.error()) - } -} - -#[stable(feature = "rust1", since = "1.0.0")] impl fmt::Display for IntoInnerError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { self.error().fmt(f) @@ -696,7 +663,6 @@ impl fmt::Display for IntoInnerError { /// # Ok(()) /// # } /// ``` -#[stable(feature = "rust1", since = "1.0.0")] pub struct LineWriter { inner: BufWriter, need_flush: bool, @@ -717,7 +683,6 @@ impl LineWriter { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn new(inner: W) -> LineWriter { // Lines typically aren't that long, don't use a giant buffer LineWriter::with_capacity(1024, inner) @@ -738,7 +703,6 @@ impl LineWriter { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn with_capacity(cap: usize, inner: W) -> LineWriter { LineWriter { inner: BufWriter::with_capacity(cap, inner), @@ -762,7 +726,6 @@ impl LineWriter { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn get_ref(&self) -> &W { self.inner.get_ref() } /// Gets a mutable reference to the underlying writer. @@ -785,7 +748,6 @@ impl LineWriter { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn get_mut(&mut self) -> &mut W { self.inner.get_mut() } /// Unwraps this `LineWriter`, returning the underlying writer. @@ -811,7 +773,6 @@ impl LineWriter { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn into_inner(self) -> Result>> { self.inner.into_inner().map_err(|IntoInnerError(buf, e)| { IntoInnerError(LineWriter { @@ -822,7 +783,6 @@ impl LineWriter { } } -#[stable(feature = "rust1", since = "1.0.0")] impl Write for LineWriter { fn write(&mut self, buf: &[u8]) -> io::Result { if self.need_flush { @@ -867,7 +827,6 @@ impl Write for LineWriter { } } -#[stable(feature = "rust1", since = "1.0.0")] impl fmt::Debug for LineWriter where W: fmt::Debug { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fmt.debug_struct("LineWriter") diff --git a/cursor.rs b/cursor.rs index b5ea553..b31cfa3 100644 --- a/cursor.rs +++ b/cursor.rs @@ -8,10 +8,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use core::prelude::v1::*; use io::prelude::*; -use core::convert::TryInto; -use cmp; +#[cfg(feature = "collections")] use core::convert::TryInto; +use core::cmp; use io::{self, Initializer, SeekFrom, Error, ErrorKind}; /// A `Cursor` wraps another type and provides it with a @@ -79,7 +80,6 @@ use io::{self, Initializer, SeekFrom, Error, ErrorKind}; /// assert_eq!(&buff.get_ref()[5..15], &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]); /// } /// ``` -#[stable(feature = "rust1", since = "1.0.0")] #[derive(Clone, Debug)] pub struct Cursor { inner: T, @@ -102,7 +102,6 @@ impl Cursor { /// # fn force_inference(_: &Cursor>) {} /// # force_inference(&buff); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn new(inner: T) -> Cursor { Cursor { pos: 0, inner: inner } } @@ -120,7 +119,6 @@ impl Cursor { /// /// let vec = buff.into_inner(); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn into_inner(self) -> T { self.inner } /// Gets a reference to the underlying value in this cursor. @@ -136,7 +134,6 @@ impl Cursor { /// /// let reference = buff.get_ref(); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn get_ref(&self) -> &T { &self.inner } /// Gets a mutable reference to the underlying value in this cursor. @@ -155,7 +152,6 @@ impl Cursor { /// /// let reference = buff.get_mut(); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn get_mut(&mut self) -> &mut T { &mut self.inner } /// Returns the current position of this cursor. @@ -177,7 +173,6 @@ impl Cursor { /// buff.seek(SeekFrom::Current(-1)).unwrap(); /// assert_eq!(buff.position(), 1); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn position(&self) -> u64 { self.pos } /// Sets the position of this cursor. @@ -197,11 +192,9 @@ impl Cursor { /// buff.set_position(4); /// assert_eq!(buff.position(), 4); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn set_position(&mut self, pos: u64) { self.pos = pos; } } -#[stable(feature = "rust1", since = "1.0.0")] impl io::Seek for Cursor where T: AsRef<[u8]> { fn seek(&mut self, style: SeekFrom) -> io::Result { let (base_pos, offset) = match style { @@ -222,17 +215,16 @@ impl io::Seek for Cursor where T: AsRef<[u8]> { } } -#[stable(feature = "rust1", since = "1.0.0")] impl Read for Cursor where T: AsRef<[u8]> { fn read(&mut self, buf: &mut [u8]) -> io::Result { - let n = Read::read(&mut self.fill_buf()?, buf)?; + let n = Read::read(&mut self.get_buf()?, buf)?; self.pos += n as u64; Ok(n) } fn read_exact(&mut self, buf: &mut [u8]) -> io::Result<()> { let n = buf.len(); - Read::read_exact(&mut self.fill_buf()?, buf)?; + Read::read_exact(&mut self.get_buf()?, buf)?; self.pos += n as u64; Ok(()) } @@ -243,16 +235,19 @@ impl Read for Cursor where T: AsRef<[u8]> { } } -#[stable(feature = "rust1", since = "1.0.0")] -impl BufRead for Cursor where T: AsRef<[u8]> { - fn fill_buf(&mut self) -> io::Result<&[u8]> { +impl Cursor where T: AsRef<[u8]> { + fn get_buf(&mut self) -> io::Result<&[u8]> { let amt = cmp::min(self.pos, self.inner.as_ref().len() as u64); Ok(&self.inner.as_ref()[(amt as usize)..]) } +} + +#[cfg(feature="collections")] +impl BufRead for Cursor where T: AsRef<[u8]> { + fn fill_buf(&mut self) -> io::Result<&[u8]> { self.get_buf() } fn consume(&mut self, amt: usize) { self.pos += amt as u64; } } -#[stable(feature = "rust1", since = "1.0.0")] impl<'a> Write for Cursor<&'a mut [u8]> { #[inline] fn write(&mut self, data: &[u8]) -> io::Result { @@ -264,7 +259,7 @@ impl<'a> Write for Cursor<&'a mut [u8]> { fn flush(&mut self) -> io::Result<()> { Ok(()) } } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature = "collections")] impl Write for Cursor> { fn write(&mut self, buf: &[u8]) -> io::Result { let pos: usize = self.position().try_into().map_err(|_| { @@ -294,8 +289,8 @@ impl Write for Cursor> { fn flush(&mut self) -> io::Result<()> { Ok(()) } } -#[stable(feature = "cursor_box_slice", since = "1.5.0")] -impl Write for Cursor> { +#[cfg(feature = "alloc")] +impl Write for Cursor<::alloc::boxed::Box<[u8]>> { #[inline] fn write(&mut self, buf: &[u8]) -> io::Result { let pos = cmp::min(self.pos, self.inner.len() as u64); diff --git a/error.rs b/error.rs index bb9383d..01ddea6 100644 --- a/error.rs +++ b/error.rs @@ -8,11 +8,16 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use error; -use fmt; -use result; -use sys; -use convert::From; +#[cfg(feature="alloc")] use alloc::boxed::Box; +#[cfg(not(feature="alloc"))] use ::FakeBox as Box; +use core::convert::Into; +use core::fmt; +use core::marker::{Send, Sync}; +use core::option::Option::{self, Some, None}; +use core::result; +#[cfg(feature="collections")] use collections::string::String; +#[cfg(not(feature="collections"))] use ::ErrorString as String; +use core::convert::From; /// A specialized [`Result`](../result/enum.Result.html) type for I/O /// operations. @@ -48,7 +53,6 @@ use convert::From; /// Ok(buffer) /// } /// ``` -#[stable(feature = "rust1", since = "1.0.0")] pub type Result = result::Result; /// The error type for I/O operations of the [`Read`], [`Write`], [`Seek`], and @@ -63,7 +67,6 @@ pub type Result = result::Result; /// [`Seek`]: ../io/trait.Seek.html /// [`ErrorKind`]: enum.ErrorKind.html #[derive(Debug)] -#[stable(feature = "rust1", since = "1.0.0")] pub struct Error { repr: Repr, } @@ -71,13 +74,16 @@ pub struct Error { enum Repr { Os(i32), Simple(ErrorKind), + #[cfg(feature="alloc")] Custom(Box), + #[cfg(not(feature="alloc"))] + Custom(Custom), } #[derive(Debug)] struct Custom { kind: ErrorKind, - error: Box, + error: String, } /// A list specifying general categories of I/O error. @@ -89,47 +95,34 @@ struct Custom { /// /// [`io::Error`]: struct.Error.html #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)] -#[stable(feature = "rust1", since = "1.0.0")] #[allow(deprecated)] pub enum ErrorKind { /// An entity was not found, often a file. - #[stable(feature = "rust1", since = "1.0.0")] NotFound, /// The operation lacked the necessary privileges to complete. - #[stable(feature = "rust1", since = "1.0.0")] PermissionDenied, /// The connection was refused by the remote server. - #[stable(feature = "rust1", since = "1.0.0")] ConnectionRefused, /// The connection was reset by the remote server. - #[stable(feature = "rust1", since = "1.0.0")] ConnectionReset, /// The connection was aborted (terminated) by the remote server. - #[stable(feature = "rust1", since = "1.0.0")] ConnectionAborted, /// The network operation failed because it was not connected yet. - #[stable(feature = "rust1", since = "1.0.0")] NotConnected, /// A socket address could not be bound because the address is already in /// use elsewhere. - #[stable(feature = "rust1", since = "1.0.0")] AddrInUse, /// A nonexistent interface was requested or the requested address was not /// local. - #[stable(feature = "rust1", since = "1.0.0")] AddrNotAvailable, /// The operation failed because a pipe was closed. - #[stable(feature = "rust1", since = "1.0.0")] BrokenPipe, /// An entity already exists, often a file. - #[stable(feature = "rust1", since = "1.0.0")] AlreadyExists, /// The operation needs to block to complete, but the blocking operation was /// requested to not occur. - #[stable(feature = "rust1", since = "1.0.0")] WouldBlock, /// A parameter was incorrect. - #[stable(feature = "rust1", since = "1.0.0")] InvalidInput, /// Data not valid for the operation were encountered. /// @@ -141,10 +134,8 @@ pub enum ErrorKind { /// `InvalidData` if the file's contents are not valid UTF-8. /// /// [`InvalidInput`]: #variant.InvalidInput - #[stable(feature = "io_invalid_data", since = "1.2.0")] InvalidData, /// The I/O operation's timeout expired, causing it to be canceled. - #[stable(feature = "rust1", since = "1.0.0")] TimedOut, /// An error returned when an operation could not be completed because a /// call to [`write`] returned [`Ok(0)`]. @@ -155,15 +146,12 @@ pub enum ErrorKind { /// /// [`write`]: ../../std/io/trait.Write.html#tymethod.write /// [`Ok(0)`]: ../../std/io/type.Result.html - #[stable(feature = "rust1", since = "1.0.0")] WriteZero, /// This operation was interrupted. /// /// Interrupted operations can typically be retried. - #[stable(feature = "rust1", since = "1.0.0")] Interrupted, /// Any I/O error not part of this list. - #[stable(feature = "rust1", since = "1.0.0")] Other, /// An error returned when an operation could not be completed because an @@ -172,15 +160,10 @@ pub enum ErrorKind { /// This typically means that an operation could only succeed if it read a /// particular number of bytes but only a smaller number of bytes could be /// read. - #[stable(feature = "read_exact", since = "1.6.0")] UnexpectedEof, /// A marker variant that tells the compiler that users of this enum cannot /// match it exhaustively. - #[unstable(feature = "io_error_internals", - reason = "better expressed through extensible enums that this \ - enum cannot be exhaustively matched against", - issue = "0")] #[doc(hidden)] __Nonexhaustive, } @@ -213,7 +196,6 @@ impl ErrorKind { /// Intended for use for errors not exposed to the user, where allocating onto /// the heap (for normal construction via Error::new) is too costly. -#[stable(feature = "io_error_from_errorkind", since = "1.14.0")] impl From for Error { #[inline] fn from(kind: ErrorKind) -> Error { @@ -242,14 +224,13 @@ impl Error { /// // errors can also be created from other errors /// let custom_error2 = Error::new(ErrorKind::Interrupted, custom_error); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn new(kind: ErrorKind, error: E) -> Error - where E: Into> + where E: Into { Self::_new(kind, error.into()) } - fn _new(kind: ErrorKind, error: Box) -> Error { + fn _new(kind: ErrorKind, error: String) -> Error { Error { repr: Repr::Custom(Box::new(Custom { kind, @@ -258,24 +239,6 @@ impl Error { } } - /// Returns an error representing the last OS error which occurred. - /// - /// This function reads the value of `errno` for the target platform (e.g. - /// `GetLastError` on Windows) and will return a corresponding instance of - /// `Error` for the error code. - /// - /// # Examples - /// - /// ``` - /// use std::io::Error; - /// - /// println!("last OS error: {:?}", Error::last_os_error()); - /// ``` - #[stable(feature = "rust1", since = "1.0.0")] - pub fn last_os_error() -> Error { - Error::from_raw_os_error(sys::os::errno() as i32) - } - /// Creates a new instance of an `Error` from a particular OS error code. /// /// # Examples @@ -301,7 +264,6 @@ impl Error { /// assert_eq!(error.kind(), io::ErrorKind::AddrInUse); /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn from_raw_os_error(code: i32) -> Error { Error { repr: Repr::Os(code) } } @@ -332,7 +294,6 @@ impl Error { /// print_os_error(&Error::new(ErrorKind::Other, "oh no!")); /// } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn raw_os_error(&self) -> Option { match self.repr { Repr::Os(i) => Some(i), @@ -366,12 +327,11 @@ impl Error { /// print_error(&Error::new(ErrorKind::Other, "oh no!")); /// } /// ``` - #[stable(feature = "io_error_inner", since = "1.3.0")] - pub fn get_ref(&self) -> Option<&(error::Error+Send+Sync+'static)> { + pub fn get_ref(&self) -> Option<&String> { match self.repr { Repr::Os(..) => None, Repr::Simple(..) => None, - Repr::Custom(ref c) => Some(&*c.error), + Repr::Custom(ref c) => Some(&c.error), } } @@ -437,12 +397,11 @@ impl Error { /// print_error(&change_error(Error::new(ErrorKind::Other, MyError::new()))); /// } /// ``` - #[stable(feature = "io_error_inner", since = "1.3.0")] - pub fn get_mut(&mut self) -> Option<&mut (error::Error+Send+Sync+'static)> { + pub fn get_mut(&mut self) -> Option<&mut String> { match self.repr { Repr::Os(..) => None, Repr::Simple(..) => None, - Repr::Custom(ref mut c) => Some(&mut *c.error), + Repr::Custom(ref mut c) => Some(&mut c.error), } } @@ -471,8 +430,7 @@ impl Error { /// print_error(Error::new(ErrorKind::Other, "oh no!")); /// } /// ``` - #[stable(feature = "io_error_inner", since = "1.3.0")] - pub fn into_inner(self) -> Option> { + pub fn into_inner(self) -> Option { match self.repr { Repr::Os(..) => None, Repr::Simple(..) => None, @@ -498,10 +456,9 @@ impl Error { /// print_error(Error::new(ErrorKind::AddrInUse, "oh no!")); /// } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn kind(&self) -> ErrorKind { match self.repr { - Repr::Os(code) => sys::decode_error_kind(code), + Repr::Os(_code) => ErrorKind::Other, Repr::Custom(ref c) => c.kind, Repr::Simple(kind) => kind, } @@ -512,21 +469,18 @@ impl fmt::Debug for Repr { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { match *self { Repr::Os(ref code) => - fmt.debug_struct("Os").field("code", code) - .field("message", &sys::os::error_string(*code)).finish(), + fmt.debug_struct("Os").field("code", code).finish(), Repr::Custom(ref c) => fmt.debug_tuple("Custom").field(c).finish(), Repr::Simple(kind) => fmt.debug_tuple("Kind").field(&kind).finish(), } } } -#[stable(feature = "rust1", since = "1.0.0")] impl fmt::Display for Error { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { match self.repr { Repr::Os(code) => { - let detail = sys::os::error_string(code); - write!(fmt, "{} (os error {})", detail, code) + write!(fmt, "os error {}", code) } Repr::Custom(ref c) => c.error.fmt(fmt), Repr::Simple(kind) => write!(fmt, "{}", kind.as_str()), @@ -534,24 +488,6 @@ impl fmt::Display for Error { } } -#[stable(feature = "rust1", since = "1.0.0")] -impl error::Error for Error { - fn description(&self) -> &str { - match self.repr { - Repr::Os(..) | Repr::Simple(..) => self.kind().as_str(), - Repr::Custom(ref c) => c.error.description(), - } - } - - fn cause(&self) -> Option<&error::Error> { - match self.repr { - Repr::Os(..) => None, - Repr::Simple(..) => None, - Repr::Custom(ref c) => c.error.cause(), - } - } -} - fn _assert_error_is_sync_send() { fn _is_sync_send() {} _is_sync_send::(); diff --git a/impls.rs b/impls.rs index fe1179a..452b8b7 100644 --- a/impls.rs +++ b/impls.rs @@ -8,15 +8,18 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use cmp; -use io::{self, SeekFrom, Read, Initializer, Write, Seek, BufRead, Error, ErrorKind}; -use fmt; -use mem; +#[cfg(feature="alloc")] use alloc::boxed::Box; +use core::cmp; +use io::{self, SeekFrom, Read, Initializer, Write, Seek, Error, ErrorKind}; +#[cfg(feature="collections")] use io::BufRead; +use core::fmt; +use core::mem; +#[cfg(feature="collections")] use collections::string::String; +#[cfg(feature="collections")] use collections::vec::Vec; // ============================================================================= // Forwarding implementations -#[stable(feature = "rust1", since = "1.0.0")] impl<'a, R: Read + ?Sized> Read for &'a mut R { #[inline] fn read(&mut self, buf: &mut [u8]) -> io::Result { @@ -28,11 +31,13 @@ impl<'a, R: Read + ?Sized> Read for &'a mut R { (**self).initializer() } + #[cfg(feature="collections")] #[inline] fn read_to_end(&mut self, buf: &mut Vec) -> io::Result { (**self).read_to_end(buf) } + #[cfg(feature="collections")] #[inline] fn read_to_string(&mut self, buf: &mut String) -> io::Result { (**self).read_to_string(buf) @@ -43,7 +48,6 @@ impl<'a, R: Read + ?Sized> Read for &'a mut R { (**self).read_exact(buf) } } -#[stable(feature = "rust1", since = "1.0.0")] impl<'a, W: Write + ?Sized> Write for &'a mut W { #[inline] fn write(&mut self, buf: &[u8]) -> io::Result { (**self).write(buf) } @@ -61,12 +65,11 @@ impl<'a, W: Write + ?Sized> Write for &'a mut W { (**self).write_fmt(fmt) } } -#[stable(feature = "rust1", since = "1.0.0")] impl<'a, S: Seek + ?Sized> Seek for &'a mut S { #[inline] fn seek(&mut self, pos: SeekFrom) -> io::Result { (**self).seek(pos) } } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] impl<'a, B: BufRead + ?Sized> BufRead for &'a mut B { #[inline] fn fill_buf(&mut self) -> io::Result<&[u8]> { (**self).fill_buf() } @@ -85,7 +88,7 @@ impl<'a, B: BufRead + ?Sized> BufRead for &'a mut B { } } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="alloc")] impl Read for Box { #[inline] fn read(&mut self, buf: &mut [u8]) -> io::Result { @@ -97,11 +100,13 @@ impl Read for Box { (**self).initializer() } + #[cfg(feature="collections")] #[inline] fn read_to_end(&mut self, buf: &mut Vec) -> io::Result { (**self).read_to_end(buf) } + #[cfg(feature="collections")] #[inline] fn read_to_string(&mut self, buf: &mut String) -> io::Result { (**self).read_to_string(buf) @@ -112,7 +117,7 @@ impl Read for Box { (**self).read_exact(buf) } } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="alloc")] impl Write for Box { #[inline] fn write(&mut self, buf: &[u8]) -> io::Result { (**self).write(buf) } @@ -130,12 +135,12 @@ impl Write for Box { (**self).write_fmt(fmt) } } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="alloc")] impl Seek for Box { #[inline] fn seek(&mut self, pos: SeekFrom) -> io::Result { (**self).seek(pos) } } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] impl BufRead for Box { #[inline] fn fill_buf(&mut self) -> io::Result<&[u8]> { (**self).fill_buf() } @@ -161,7 +166,6 @@ impl BufRead for Box { /// /// Note that reading updates the slice to point to the yet unread part. /// The slice will be empty when EOF is reached. -#[stable(feature = "rust1", since = "1.0.0")] impl<'a> Read for &'a [u8] { #[inline] fn read(&mut self, buf: &mut [u8]) -> io::Result { @@ -207,6 +211,7 @@ impl<'a> Read for &'a [u8] { Ok(()) } + #[cfg(feature="collections")] #[inline] fn read_to_end(&mut self, buf: &mut Vec) -> io::Result { buf.extend_from_slice(*self); @@ -216,7 +221,7 @@ impl<'a> Read for &'a [u8] { } } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] impl<'a> BufRead for &'a [u8] { #[inline] fn fill_buf(&mut self) -> io::Result<&[u8]> { Ok(*self) } @@ -230,7 +235,6 @@ impl<'a> BufRead for &'a [u8] { /// /// Note that writing updates the slice to point to the yet unwritten part. /// The slice will be empty when it has been completely overwritten. -#[stable(feature = "rust1", since = "1.0.0")] impl<'a> Write for &'a mut [u8] { #[inline] fn write(&mut self, data: &[u8]) -> io::Result { @@ -256,7 +260,7 @@ impl<'a> Write for &'a mut [u8] { /// Write is implemented for `Vec` by appending to the vector. /// The vector will grow as needed. -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] impl Write for Vec { #[inline] fn write(&mut self, buf: &[u8]) -> io::Result { diff --git a/mod.rs b/mod.rs index e9b707c..f98ebae 100644 --- a/mod.rs +++ b/mod.rs @@ -268,50 +268,38 @@ //! [`Result`]: ../result/enum.Result.html //! [`.unwrap()`]: ../result/enum.Result.html#method.unwrap -#![stable(feature = "rust1", since = "1.0.0")] - -use cmp; +use core::cmp; use core::str as core_str; -use error as std_error; -use fmt; -use result; -use str; -use memchr; -use ptr; - -#[stable(feature = "rust1", since = "1.0.0")] -pub use self::buffered::{BufReader, BufWriter, LineWriter}; -#[stable(feature = "rust1", since = "1.0.0")] -pub use self::buffered::IntoInnerError; -#[stable(feature = "rust1", since = "1.0.0")] +use core::fmt; +use core::result; +#[cfg(feature="collections")] use collections::string::String; +use core::str; +#[cfg(feature="collections")] use collections::vec::Vec; +#[cfg(not(core_memchr))] +mod memchr; +#[cfg(all(feature="collections",core_memchr))] +use core::slice::memchr; +use core::ptr; + +#[cfg(feature="collections")] pub use self::buffered::{BufReader, BufWriter, LineWriter}; +#[cfg(feature="collections")] pub use self::buffered::IntoInnerError; pub use self::cursor::Cursor; -#[stable(feature = "rust1", since = "1.0.0")] pub use self::error::{Result, Error, ErrorKind}; -#[stable(feature = "rust1", since = "1.0.0")] pub use self::util::{copy, sink, Sink, empty, Empty, repeat, Repeat}; -#[stable(feature = "rust1", since = "1.0.0")] -pub use self::stdio::{stdin, stdout, stderr, Stdin, Stdout, Stderr}; -#[stable(feature = "rust1", since = "1.0.0")] -pub use self::stdio::{StdoutLock, StderrLock, StdinLock}; -#[unstable(feature = "print_internals", issue = "0")] -pub use self::stdio::{_print, _eprint}; -#[unstable(feature = "libstd_io_internals", issue = "42788")] -#[doc(no_inline, hidden)] -pub use self::stdio::{set_panic, set_print}; pub mod prelude; -mod buffered; +#[cfg(feature="collections")] mod buffered; mod cursor; mod error; mod impls; -mod lazy; mod util; -mod stdio; -const DEFAULT_BUF_SIZE: usize = ::sys_common::io::DEFAULT_BUF_SIZE; +const DEFAULT_BUF_SIZE: usize = 8 * 1024; +#[cfg(feature="collections")] struct Guard<'a> { buf: &'a mut Vec, len: usize } +#[cfg(feature="collections")] impl<'a> Drop for Guard<'a> { fn drop(&mut self) { unsafe { self.buf.set_len(self.len); } @@ -336,6 +324,7 @@ impl<'a> Drop for Guard<'a> { // 2. We're passing a raw buffer to the function `f`, and it is expected that // the function only *appends* bytes to the buffer. We'll get undefined // behavior if existing bytes are overwritten to have non-UTF-8 data. +#[cfg(feature="collections")] fn append_to_string(buf: &mut String, f: F) -> Result where F: FnOnce(&mut Vec) -> Result { @@ -363,6 +352,7 @@ fn append_to_string(buf: &mut String, f: F) -> Result // // Because we're extending the buffer with uninitialized data for trusted // readers, we need to make sure to truncate that if any of this panics. +#[cfg(feature="collections")] fn read_to_end(r: &mut R, buf: &mut Vec) -> Result { let start_len = buf.len(); let mut g = Guard { len: buf.len(), buf: buf }; @@ -466,7 +456,6 @@ fn read_to_end(r: &mut R, buf: &mut Vec) -> Result /// [`BufReader`]: struct.BufReader.html /// [`&str`]: ../../std/primitive.str.html /// [slice]: ../../std/primitive.slice.html -#[stable(feature = "rust1", since = "1.0.0")] #[doc(spotlight)] pub trait Read { /// Pull some bytes from this source into the specified buffer, returning @@ -523,7 +512,6 @@ pub trait Read { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn read(&mut self, buf: &mut [u8]) -> Result; /// Determines if this `Read`er can work with buffers of uninitialized @@ -548,7 +536,6 @@ pub trait Read { /// /// [`Initializer::nop()`]: ../../std/io/struct.Initializer.html#method.nop /// [`Initializer`]: ../../std/io/struct.Initializer.html - #[unstable(feature = "read_initializer", issue = "42788")] #[inline] unsafe fn initializer(&self) -> Initializer { Initializer::zeroing() @@ -596,7 +583,7 @@ pub trait Read { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] + #[cfg(feature="collections")] fn read_to_end(&mut self, buf: &mut Vec) -> Result { read_to_end(self, buf) } @@ -634,7 +621,7 @@ pub trait Read { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] + #[cfg(feature="collections")] fn read_to_string(&mut self, buf: &mut String) -> Result { // Note that we do *not* call `.read_to_end()` here. We are passing // `&mut Vec` (the raw contents of `buf`) into the `read_to_end` @@ -697,7 +684,6 @@ pub trait Read { /// # Ok(()) /// # } /// ``` - #[stable(feature = "read_exact", since = "1.6.0")] fn read_exact(&mut self, mut buf: &mut [u8]) -> Result<()> { while !buf.is_empty() { match self.read(buf) { @@ -749,7 +735,6 @@ pub trait Read { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn by_ref(&mut self) -> &mut Self where Self: Sized { self } /// Transforms this `Read` instance to an [`Iterator`] over its bytes. @@ -786,7 +771,6 @@ pub trait Read { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn bytes(self) -> Bytes where Self: Sized { Bytes { inner: self } } @@ -827,10 +811,6 @@ pub trait Read { /// # Ok(()) /// # } /// ``` - #[unstable(feature = "io", reason = "the semantics of a partial read/write \ - of where errors happen is currently \ - unclear and may change", - issue = "27802")] fn chars(self) -> Chars where Self: Sized { Chars { inner: self } } @@ -865,7 +845,6 @@ pub trait Read { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn chain(self, next: R) -> Chain where Self: Sized { Chain { first: self, second: next, done_first: false } } @@ -901,20 +880,17 @@ pub trait Read { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn take(self, limit: u64) -> Take where Self: Sized { Take { inner: self, limit: limit } } } /// A type used to conditionally initialize buffers passed to `Read` methods. -#[unstable(feature = "read_initializer", issue = "42788")] #[derive(Debug)] pub struct Initializer(bool); impl Initializer { /// Returns a new `Initializer` which will zero out buffers. - #[unstable(feature = "read_initializer", issue = "42788")] #[inline] pub fn zeroing() -> Initializer { Initializer(true) @@ -928,21 +904,18 @@ impl Initializer { /// read from buffers passed to `Read` methods, and that the return value of /// the method accurately reflects the number of bytes that have been /// written to the head of the buffer. - #[unstable(feature = "read_initializer", issue = "42788")] #[inline] pub unsafe fn nop() -> Initializer { Initializer(false) } /// Indicates if a buffer should be initialized. - #[unstable(feature = "read_initializer", issue = "42788")] #[inline] pub fn should_initialize(&self) -> bool { self.0 } /// Initializes a buffer if necessary. - #[unstable(feature = "read_initializer", issue = "42788")] #[inline] pub fn initialize(&self, buf: &mut [u8]) { if self.should_initialize() { @@ -985,7 +958,6 @@ impl Initializer { /// # Ok(()) /// # } /// ``` -#[stable(feature = "rust1", since = "1.0.0")] #[doc(spotlight)] pub trait Write { /// Write a buffer into this object, returning how many bytes were written. @@ -1030,7 +1002,6 @@ pub trait Write { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn write(&mut self, buf: &[u8]) -> Result; /// Flush this output stream, ensuring that all intermediately buffered @@ -1056,7 +1027,6 @@ pub trait Write { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn flush(&mut self) -> Result<()>; /// Attempts to write an entire buffer into this write. @@ -1086,7 +1056,6 @@ pub trait Write { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn write_all(&mut self, mut buf: &[u8]) -> Result<()> { while !buf.is_empty() { match self.write(buf) { @@ -1138,7 +1107,6 @@ pub trait Write { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<()> { // Create a shim which translates a Write to a fmt::Write and saves // off I/O errors. instead of discarding them @@ -1194,7 +1162,6 @@ pub trait Write { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn by_ref(&mut self) -> &mut Self where Self: Sized { self } } @@ -1224,7 +1191,6 @@ pub trait Write { /// # Ok(()) /// # } /// ``` -#[stable(feature = "rust1", since = "1.0.0")] pub trait Seek { /// Seek to an offset, in bytes, in a stream. /// @@ -1240,7 +1206,6 @@ pub trait Seek { /// Seeking to a negative offset is considered an error. /// /// [`SeekFrom::Start`]: enum.SeekFrom.html#variant.Start - #[stable(feature = "rust1", since = "1.0.0")] fn seek(&mut self, pos: SeekFrom) -> Result; } @@ -1250,29 +1215,26 @@ pub trait Seek { /// /// [`Seek`]: trait.Seek.html #[derive(Copy, PartialEq, Eq, Clone, Debug)] -#[stable(feature = "rust1", since = "1.0.0")] pub enum SeekFrom { /// Set the offset to the provided number of bytes. - #[stable(feature = "rust1", since = "1.0.0")] - Start(#[stable(feature = "rust1", since = "1.0.0")] u64), + Start(u64), /// Set the offset to the size of this object plus the specified number of /// bytes. /// /// It is possible to seek beyond the end of an object, but it's an error to /// seek before byte 0. - #[stable(feature = "rust1", since = "1.0.0")] - End(#[stable(feature = "rust1", since = "1.0.0")] i64), + End(i64), /// Set the offset to the current position plus the specified number of /// bytes. /// /// It is possible to seek beyond the end of an object, but it's an error to /// seek before byte 0. - #[stable(feature = "rust1", since = "1.0.0")] - Current(#[stable(feature = "rust1", since = "1.0.0")] i64), + Current(i64), } +#[cfg(feature="collections")] fn read_until(r: &mut R, delim: u8, buf: &mut Vec) -> Result { let mut read = 0; @@ -1352,7 +1314,7 @@ fn read_until(r: &mut R, delim: u8, buf: &mut Vec) /// # } /// ``` /// -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] pub trait BufRead: Read { /// Fills the internal buffer of this object, returning the buffer contents. /// @@ -1397,7 +1359,6 @@ pub trait BufRead: Read { /// // ensure the bytes we worked with aren't returned again later /// stdin.consume(length); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn fill_buf(&mut self) -> Result<&[u8]>; /// Tells this buffer that `amt` bytes have been consumed from the buffer, @@ -1419,7 +1380,6 @@ pub trait BufRead: Read { /// that method's example includes an example of `consume()`. /// /// [`fill_buf`]: #tymethod.fill_buf - #[stable(feature = "rust1", since = "1.0.0")] fn consume(&mut self, amt: usize); /// Read all bytes into `buf` until the delimiter `byte` or EOF is reached. @@ -1477,7 +1437,6 @@ pub trait BufRead: Read { /// assert_eq!(num_bytes, 0); /// assert_eq!(buf, b""); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn read_until(&mut self, byte: u8, buf: &mut Vec) -> Result { read_until(self, byte, buf) } @@ -1534,7 +1493,6 @@ pub trait BufRead: Read { /// assert_eq!(num_bytes, 0); /// assert_eq!(buf, ""); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn read_line(&mut self, buf: &mut String) -> Result { // Note that we are not calling the `.read_until` method here, but // rather our hardcoded implementation. For more details as to why, see @@ -1575,7 +1533,6 @@ pub trait BufRead: Read { /// assert_eq!(split_iter.next(), Some(b"dolor".to_vec())); /// assert_eq!(split_iter.next(), None); /// ``` - #[stable(feature = "rust1", since = "1.0.0")] fn split(self, byte: u8) -> Split where Self: Sized { Split { buf: self, delim: byte } } @@ -1614,7 +1571,6 @@ pub trait BufRead: Read { /// Each line of the iterator has the same error semantics as [`BufRead::read_line`]. /// /// [`BufRead::read_line`]: trait.BufRead.html#method.read_line - #[stable(feature = "rust1", since = "1.0.0")] fn lines(self) -> Lines where Self: Sized { Lines { buf: self } } @@ -1626,7 +1582,6 @@ pub trait BufRead: Read { /// Please see the documentation of [`chain`] for more details. /// /// [`chain`]: trait.Read.html#method.chain -#[stable(feature = "rust1", since = "1.0.0")] pub struct Chain { first: T, second: U, @@ -1652,7 +1607,6 @@ impl Chain { /// # Ok(()) /// # } /// ``` - #[stable(feature = "more_io_inner_methods", since = "1.20.0")] pub fn into_inner(self) -> (T, U) { (self.first, self.second) } @@ -1675,7 +1629,6 @@ impl Chain { /// # Ok(()) /// # } /// ``` - #[stable(feature = "more_io_inner_methods", since = "1.20.0")] pub fn get_ref(&self) -> (&T, &U) { (&self.first, &self.second) } @@ -1702,13 +1655,11 @@ impl Chain { /// # Ok(()) /// # } /// ``` - #[stable(feature = "more_io_inner_methods", since = "1.20.0")] pub fn get_mut(&mut self) -> (&mut T, &mut U) { (&mut self.first, &mut self.second) } } -#[stable(feature = "std_debug", since = "1.16.0")] impl fmt::Debug for Chain { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.debug_struct("Chain") @@ -1718,7 +1669,6 @@ impl fmt::Debug for Chain { } } -#[stable(feature = "rust1", since = "1.0.0")] impl Read for Chain { fn read(&mut self, buf: &mut [u8]) -> Result { if !self.done_first { @@ -1740,7 +1690,7 @@ impl Read for Chain { } } -#[stable(feature = "chain_bufread", since = "1.9.0")] +#[cfg(feature="collections")] impl BufRead for Chain { fn fill_buf(&mut self) -> Result<&[u8]> { if !self.done_first { @@ -1767,7 +1717,6 @@ impl BufRead for Chain { /// Please see the documentation of [`take`] for more details. /// /// [`take`]: trait.Read.html#method.take -#[stable(feature = "rust1", since = "1.0.0")] #[derive(Debug)] pub struct Take { inner: T, @@ -1802,7 +1751,6 @@ impl Take { /// # Ok(()) /// # } /// ``` - #[stable(feature = "rust1", since = "1.0.0")] pub fn limit(&self) -> u64 { self.limit } /// Sets the number of bytes that can be read before this instance will @@ -1829,7 +1777,6 @@ impl Take { /// # Ok(()) /// # } /// ``` - #[unstable(feature = "take_set_limit", issue = "42781")] pub fn set_limit(&mut self, limit: u64) { self.limit = limit; } @@ -1854,7 +1801,6 @@ impl Take { /// # Ok(()) /// # } /// ``` - #[stable(feature = "io_take_into_inner", since = "1.15.0")] pub fn into_inner(self) -> T { self.inner } @@ -1879,7 +1825,6 @@ impl Take { /// # Ok(()) /// # } /// ``` - #[stable(feature = "more_io_inner_methods", since = "1.20.0")] pub fn get_ref(&self) -> &T { &self.inner } @@ -1908,13 +1853,11 @@ impl Take { /// # Ok(()) /// # } /// ``` - #[stable(feature = "more_io_inner_methods", since = "1.20.0")] pub fn get_mut(&mut self) -> &mut T { &mut self.inner } } -#[stable(feature = "rust1", since = "1.0.0")] impl Read for Take { fn read(&mut self, buf: &mut [u8]) -> Result { // Don't call into inner reader at all at EOF because it may still block @@ -1933,7 +1876,7 @@ impl Read for Take { } } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] impl BufRead for Take { fn fill_buf(&mut self) -> Result<&[u8]> { // Don't call into inner reader at all at EOF because it may still block @@ -1972,13 +1915,11 @@ fn read_one_byte(reader: &mut Read) -> Option> { /// Please see the documentation of [`bytes`] for more details. /// /// [`bytes`]: trait.Read.html#method.bytes -#[stable(feature = "rust1", since = "1.0.0")] #[derive(Debug)] pub struct Bytes { inner: R, } -#[stable(feature = "rust1", since = "1.0.0")] impl Iterator for Bytes { type Item = Result; @@ -1993,8 +1934,6 @@ impl Iterator for Bytes { /// Please see the documentation of `chars()` for more details. /// /// [chars]: trait.Read.html#method.chars -#[unstable(feature = "io", reason = "awaiting stability of Read::chars", - issue = "27802")] #[derive(Debug)] pub struct Chars { inner: R, @@ -2003,8 +1942,6 @@ pub struct Chars { /// An enumeration of possible errors that can be generated from the `Chars` /// adapter. #[derive(Debug)] -#[unstable(feature = "io", reason = "awaiting stability of Read::chars", - issue = "27802")] pub enum CharsError { /// Variant representing that the underlying stream was read successfully /// but it did not contain valid utf8 data. @@ -2014,8 +1951,6 @@ pub enum CharsError { Other(Error), } -#[unstable(feature = "io", reason = "awaiting stability of Read::chars", - issue = "27802")] impl Iterator for Chars { type Item = result::Result; @@ -2046,25 +1981,6 @@ impl Iterator for Chars { } } -#[unstable(feature = "io", reason = "awaiting stability of Read::chars", - issue = "27802")] -impl std_error::Error for CharsError { - fn description(&self) -> &str { - match *self { - CharsError::NotUtf8 => "invalid utf8 encoding", - CharsError::Other(ref e) => std_error::Error::description(e), - } - } - fn cause(&self) -> Option<&std_error::Error> { - match *self { - CharsError::NotUtf8 => None, - CharsError::Other(ref e) => e.cause(), - } - } -} - -#[unstable(feature = "io", reason = "awaiting stability of Read::chars", - issue = "27802")] impl fmt::Display for CharsError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { @@ -2083,14 +1999,14 @@ impl fmt::Display for CharsError { /// `BufRead`. Please see the documentation of `split()` for more details. /// /// [split]: trait.BufRead.html#method.split -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] #[derive(Debug)] pub struct Split { buf: B, delim: u8, } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] impl Iterator for Split { type Item = Result>; @@ -2115,13 +2031,13 @@ impl Iterator for Split { /// `BufRead`. Please see the documentation of `lines()` for more details. /// /// [lines]: trait.BufRead.html#method.lines -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] #[derive(Debug)] pub struct Lines { buf: B, } -#[stable(feature = "rust1", since = "1.0.0")] +#[cfg(feature="collections")] impl Iterator for Lines { type Item = Result; diff --git a/prelude.rs b/prelude.rs index 8772d0f..49d66c9 100644 --- a/prelude.rs +++ b/prelude.rs @@ -18,7 +18,8 @@ //! use std::io::prelude::*; //! ``` -#![stable(feature = "rust1", since = "1.0.0")] +pub use super::{Read, Write, Seek}; +#[cfg(feature="collections")] pub use super::BufRead; -#[stable(feature = "rust1", since = "1.0.0")] -pub use super::{Read, Write, BufRead, Seek}; +#[cfg(feature="collections")] pub use alloc::boxed::Box; +#[cfg(feature="collections")] pub use collections::vec::Vec; diff --git a/util.rs b/util.rs index 45d281e..0efc3b1 100644 --- a/util.rs +++ b/util.rs @@ -10,9 +10,10 @@ #![allow(missing_copy_implementations)] -use fmt; -use io::{self, Read, Initializer, Write, ErrorKind, BufRead}; -use mem; +use core::fmt; +use io::{self, Read, Initializer, Write, ErrorKind}; +use core::mem; +#[cfg(feature="collections")] use io::BufRead; /// Copies the entire contents of a reader into a writer. /// @@ -45,7 +46,6 @@ use mem; /// # } /// # foo().unwrap(); /// ``` -#[stable(feature = "rust1", since = "1.0.0")] pub fn copy(reader: &mut R, writer: &mut W) -> io::Result where R: Read, W: Write { @@ -74,7 +74,6 @@ pub fn copy(reader: &mut R, writer: &mut W) -> io::Result< /// the documentation of [`empty()`][`empty`] for more details. /// /// [`empty`]: fn.empty.html -#[stable(feature = "rust1", since = "1.0.0")] pub struct Empty { _priv: () } /// Constructs a new handle to an empty reader. @@ -94,10 +93,8 @@ pub struct Empty { _priv: () } /// io::empty().read_to_string(&mut buffer).unwrap(); /// assert!(buffer.is_empty()); /// ``` -#[stable(feature = "rust1", since = "1.0.0")] pub fn empty() -> Empty { Empty { _priv: () } } -#[stable(feature = "rust1", since = "1.0.0")] impl Read for Empty { #[inline] fn read(&mut self, _buf: &mut [u8]) -> io::Result { Ok(0) } @@ -107,7 +104,8 @@ impl Read for Empty { Initializer::nop() } } -#[stable(feature = "rust1", since = "1.0.0")] + +#[cfg(feature="collections")] impl BufRead for Empty { #[inline] fn fill_buf(&mut self) -> io::Result<&[u8]> { Ok(&[]) } @@ -115,7 +113,6 @@ impl BufRead for Empty { fn consume(&mut self, _n: usize) {} } -#[stable(feature = "std_debug", since = "1.16.0")] impl fmt::Debug for Empty { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.pad("Empty { .. }") @@ -128,7 +125,6 @@ impl fmt::Debug for Empty { /// see the documentation of `repeat()` for more details. /// /// [repeat]: fn.repeat.html -#[stable(feature = "rust1", since = "1.0.0")] pub struct Repeat { byte: u8 } /// Creates an instance of a reader that infinitely repeats one byte. @@ -145,10 +141,8 @@ pub struct Repeat { byte: u8 } /// io::repeat(0b101).read_exact(&mut buffer).unwrap(); /// assert_eq!(buffer, [0b101, 0b101, 0b101]); /// ``` -#[stable(feature = "rust1", since = "1.0.0")] pub fn repeat(byte: u8) -> Repeat { Repeat { byte: byte } } -#[stable(feature = "rust1", since = "1.0.0")] impl Read for Repeat { #[inline] fn read(&mut self, buf: &mut [u8]) -> io::Result { @@ -164,7 +158,6 @@ impl Read for Repeat { } } -#[stable(feature = "std_debug", since = "1.16.0")] impl fmt::Debug for Repeat { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.pad("Repeat { .. }") @@ -177,7 +170,6 @@ impl fmt::Debug for Repeat { /// see the documentation of `sink()` for more details. /// /// [sink]: fn.sink.html -#[stable(feature = "rust1", since = "1.0.0")] pub struct Sink { _priv: () } /// Creates an instance of a writer which will successfully consume all data. @@ -194,10 +186,8 @@ pub struct Sink { _priv: () } /// let num_bytes = io::sink().write(&buffer).unwrap(); /// assert_eq!(num_bytes, 5); /// ``` -#[stable(feature = "rust1", since = "1.0.0")] pub fn sink() -> Sink { Sink { _priv: () } } -#[stable(feature = "rust1", since = "1.0.0")] impl Write for Sink { #[inline] fn write(&mut self, buf: &[u8]) -> io::Result { Ok(buf.len()) } @@ -205,7 +195,6 @@ impl Write for Sink { fn flush(&mut self) -> io::Result<()> { Ok(()) } } -#[stable(feature = "std_debug", since = "1.16.0")] impl fmt::Debug for Sink { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.pad("Sink { .. }")