2015-01-31 22:24:36 -06:00
|
|
|
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
|
|
|
use boxed::Box;
|
2015-03-31 18:01:03 -05:00
|
|
|
use convert::Into;
|
std: Stabilize the `io` module
The new `std::io` module has had some time to bake now, and this commit
stabilizes its functionality. There are still portions of the module which
remain unstable, and below contains a summart of the actions taken.
This commit also deprecates the entire contents of the `old_io` module in a
blanket fashion. All APIs should now have a reasonable replacement in the
new I/O modules.
Stable APIs:
* `std::io` (the name)
* `std::io::prelude` (the name)
* `Read`
* `Read::read`
* `Read::{read_to_end, read_to_string}` after being modified to return a `usize`
for the number of bytes read.
* `Write`
* `Write::write`
* `Write::{write_all, write_fmt}`
* `BufRead`
* `BufRead::{fill_buf, consume}`
* `BufRead::{read_line, read_until}` after being modified to return a `usize`
for the number of bytes read.
* `BufReader`
* `BufReader::{new, with_capacity}`
* `BufReader::{get_ref, get_mut, into_inner}`
* `{Read,BufRead} for BufReader`
* `BufWriter`
* `BufWriter::{new, with_capacity}`
* `BufWriter::{get_ref, get_mut, into_inner}`
* `Write for BufWriter`
* `IntoInnerError`
* `IntoInnerError::{error, into_inner}`
* `{Error,Display} for IntoInnerError`
* `LineWriter`
* `LineWriter::{new, with_capacity}` - `with_capacity` was added
* `LineWriter::{get_ref, get_mut, into_inner}` - `get_mut` was added)
* `Write for LineWriter`
* `BufStream`
* `BufStream::{new, with_capacities}`
* `BufStream::{get_ref, get_mut, into_inner}`
* `{BufRead,Read,Write} for BufStream`
* `stdin`
* `Stdin`
* `Stdin::lock`
* `Stdin::read_line` - added method
* `StdinLock`
* `Read for Stdin`
* `{Read,BufRead} for StdinLock`
* `stdout`
* `Stdout`
* `Stdout::lock`
* `StdoutLock`
* `Write for Stdout`
* `Write for StdoutLock`
* `stderr`
* `Stderr`
* `Stderr::lock`
* `StderrLock`
* `Write for Stderr`
* `Write for StderrLock`
* `io::Result`
* `io::Error`
* `io::Error::last_os_error`
* `{Display, Error} for Error`
Unstable APIs:
(reasons can be found in the commit itself)
* `Write::flush`
* `Seek`
* `ErrorKind`
* `Error::new`
* `Error::from_os_error`
* `Error::kind`
Deprecated APIs
* `Error::description` - available via the `Error` trait
* `Error::detail` - available via the `Display` implementation
* `thread::Builder::{stdout, stderr}`
Changes in functionality:
* `old_io::stdio::set_stderr` is now a noop as the infrastructure for printing
backtraces has migrated to `std::io`.
* The `ReadExt`, `WriteExt`, and `BufReadExt` extension traits were all removed
by folding functionality into the corresponding trait.
[breaking-change]
2015-03-11 16:16:46 -05:00
|
|
|
use error;
|
2015-01-31 22:24:36 -06:00
|
|
|
use fmt;
|
2015-04-06 18:30:18 -05:00
|
|
|
use marker::{Send, Sync};
|
2015-01-31 22:24:36 -06:00
|
|
|
use option::Option::{self, Some, None};
|
|
|
|
use result;
|
|
|
|
use sys;
|
|
|
|
|
|
|
|
/// A type for results generated by I/O related functions where the `Err` type
|
|
|
|
/// is hard-wired to `io::Error`.
|
|
|
|
///
|
|
|
|
/// This typedef is generally used to avoid writing out `io::Error` directly and
|
|
|
|
/// is otherwise a direct mapping to `std::result::Result`.
|
std: Stabilize the `io` module
The new `std::io` module has had some time to bake now, and this commit
stabilizes its functionality. There are still portions of the module which
remain unstable, and below contains a summart of the actions taken.
This commit also deprecates the entire contents of the `old_io` module in a
blanket fashion. All APIs should now have a reasonable replacement in the
new I/O modules.
Stable APIs:
* `std::io` (the name)
* `std::io::prelude` (the name)
* `Read`
* `Read::read`
* `Read::{read_to_end, read_to_string}` after being modified to return a `usize`
for the number of bytes read.
* `Write`
* `Write::write`
* `Write::{write_all, write_fmt}`
* `BufRead`
* `BufRead::{fill_buf, consume}`
* `BufRead::{read_line, read_until}` after being modified to return a `usize`
for the number of bytes read.
* `BufReader`
* `BufReader::{new, with_capacity}`
* `BufReader::{get_ref, get_mut, into_inner}`
* `{Read,BufRead} for BufReader`
* `BufWriter`
* `BufWriter::{new, with_capacity}`
* `BufWriter::{get_ref, get_mut, into_inner}`
* `Write for BufWriter`
* `IntoInnerError`
* `IntoInnerError::{error, into_inner}`
* `{Error,Display} for IntoInnerError`
* `LineWriter`
* `LineWriter::{new, with_capacity}` - `with_capacity` was added
* `LineWriter::{get_ref, get_mut, into_inner}` - `get_mut` was added)
* `Write for LineWriter`
* `BufStream`
* `BufStream::{new, with_capacities}`
* `BufStream::{get_ref, get_mut, into_inner}`
* `{BufRead,Read,Write} for BufStream`
* `stdin`
* `Stdin`
* `Stdin::lock`
* `Stdin::read_line` - added method
* `StdinLock`
* `Read for Stdin`
* `{Read,BufRead} for StdinLock`
* `stdout`
* `Stdout`
* `Stdout::lock`
* `StdoutLock`
* `Write for Stdout`
* `Write for StdoutLock`
* `stderr`
* `Stderr`
* `Stderr::lock`
* `StderrLock`
* `Write for Stderr`
* `Write for StderrLock`
* `io::Result`
* `io::Error`
* `io::Error::last_os_error`
* `{Display, Error} for Error`
Unstable APIs:
(reasons can be found in the commit itself)
* `Write::flush`
* `Seek`
* `ErrorKind`
* `Error::new`
* `Error::from_os_error`
* `Error::kind`
Deprecated APIs
* `Error::description` - available via the `Error` trait
* `Error::detail` - available via the `Display` implementation
* `thread::Builder::{stdout, stderr}`
Changes in functionality:
* `old_io::stdio::set_stderr` is now a noop as the infrastructure for printing
backtraces has migrated to `std::io`.
* The `ReadExt`, `WriteExt`, and `BufReadExt` extension traits were all removed
by folding functionality into the corresponding trait.
[breaking-change]
2015-03-11 16:16:46 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
pub type Result<T> = result::Result<T, Error>;
|
|
|
|
|
|
|
|
/// The error type for I/O operations of the `Read`, `Write`, `Seek`, and
|
|
|
|
/// associated traits.
|
|
|
|
///
|
|
|
|
/// Errors mostly originate from the underlying OS, but custom instances of
|
|
|
|
/// `Error` can be created with crafted error messages and a particular value of
|
|
|
|
/// `ErrorKind`.
|
2015-03-31 18:01:03 -05:00
|
|
|
#[derive(Debug)]
|
std: Stabilize the `io` module
The new `std::io` module has had some time to bake now, and this commit
stabilizes its functionality. There are still portions of the module which
remain unstable, and below contains a summart of the actions taken.
This commit also deprecates the entire contents of the `old_io` module in a
blanket fashion. All APIs should now have a reasonable replacement in the
new I/O modules.
Stable APIs:
* `std::io` (the name)
* `std::io::prelude` (the name)
* `Read`
* `Read::read`
* `Read::{read_to_end, read_to_string}` after being modified to return a `usize`
for the number of bytes read.
* `Write`
* `Write::write`
* `Write::{write_all, write_fmt}`
* `BufRead`
* `BufRead::{fill_buf, consume}`
* `BufRead::{read_line, read_until}` after being modified to return a `usize`
for the number of bytes read.
* `BufReader`
* `BufReader::{new, with_capacity}`
* `BufReader::{get_ref, get_mut, into_inner}`
* `{Read,BufRead} for BufReader`
* `BufWriter`
* `BufWriter::{new, with_capacity}`
* `BufWriter::{get_ref, get_mut, into_inner}`
* `Write for BufWriter`
* `IntoInnerError`
* `IntoInnerError::{error, into_inner}`
* `{Error,Display} for IntoInnerError`
* `LineWriter`
* `LineWriter::{new, with_capacity}` - `with_capacity` was added
* `LineWriter::{get_ref, get_mut, into_inner}` - `get_mut` was added)
* `Write for LineWriter`
* `BufStream`
* `BufStream::{new, with_capacities}`
* `BufStream::{get_ref, get_mut, into_inner}`
* `{BufRead,Read,Write} for BufStream`
* `stdin`
* `Stdin`
* `Stdin::lock`
* `Stdin::read_line` - added method
* `StdinLock`
* `Read for Stdin`
* `{Read,BufRead} for StdinLock`
* `stdout`
* `Stdout`
* `Stdout::lock`
* `StdoutLock`
* `Write for Stdout`
* `Write for StdoutLock`
* `stderr`
* `Stderr`
* `Stderr::lock`
* `StderrLock`
* `Write for Stderr`
* `Write for StderrLock`
* `io::Result`
* `io::Error`
* `io::Error::last_os_error`
* `{Display, Error} for Error`
Unstable APIs:
(reasons can be found in the commit itself)
* `Write::flush`
* `Seek`
* `ErrorKind`
* `Error::new`
* `Error::from_os_error`
* `Error::kind`
Deprecated APIs
* `Error::description` - available via the `Error` trait
* `Error::detail` - available via the `Display` implementation
* `thread::Builder::{stdout, stderr}`
Changes in functionality:
* `old_io::stdio::set_stderr` is now a noop as the infrastructure for printing
backtraces has migrated to `std::io`.
* The `ReadExt`, `WriteExt`, and `BufReadExt` extension traits were all removed
by folding functionality into the corresponding trait.
[breaking-change]
2015-03-11 16:16:46 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
pub struct Error {
|
|
|
|
repr: Repr,
|
|
|
|
}
|
|
|
|
|
2015-03-31 18:01:03 -05:00
|
|
|
#[derive(Debug)]
|
2015-01-31 22:24:36 -06:00
|
|
|
enum Repr {
|
|
|
|
Os(i32),
|
|
|
|
Custom(Box<Custom>),
|
|
|
|
}
|
|
|
|
|
2015-03-31 18:01:03 -05:00
|
|
|
#[derive(Debug)]
|
2015-01-31 22:24:36 -06:00
|
|
|
struct Custom {
|
|
|
|
kind: ErrorKind,
|
2015-04-06 18:30:18 -05:00
|
|
|
error: Box<error::Error+Send+Sync>,
|
2015-01-31 22:24:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/// A list specifying general categories of I/O error.
|
2015-03-16 20:08:57 -05:00
|
|
|
///
|
|
|
|
/// This list is intended to grow over time and it is not recommended to
|
|
|
|
/// exhaustively match against it.
|
2015-01-31 22:24:36 -06:00
|
|
|
#[derive(Copy, PartialEq, Eq, Clone, Debug)]
|
2015-03-16 20:08:57 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
pub enum ErrorKind {
|
2015-03-16 20:08:57 -05:00
|
|
|
/// 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")]
|
2015-01-31 22:24:36 -06:00
|
|
|
PermissionDenied,
|
|
|
|
/// The connection was refused by the remote server.
|
2015-03-16 20:08:57 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
ConnectionRefused,
|
|
|
|
/// The connection was reset by the remote server.
|
2015-03-16 20:08:57 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
ConnectionReset,
|
|
|
|
/// The connection was aborted (terminated) by the remote server.
|
2015-03-16 20:08:57 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
ConnectionAborted,
|
|
|
|
/// The network operation failed because it was not connected yet.
|
2015-03-16 20:08:57 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
NotConnected,
|
2015-03-16 20:08:57 -05:00
|
|
|
/// 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,
|
2015-01-31 22:24:36 -06:00
|
|
|
/// The operation failed because a pipe was closed.
|
2015-03-16 20:08:57 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
BrokenPipe,
|
2015-03-16 20:08:57 -05:00
|
|
|
/// 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")]
|
2015-01-31 22:24:36 -06:00
|
|
|
InvalidInput,
|
|
|
|
/// The I/O operation's timeout expired, causing it to be canceled.
|
2015-03-16 20:08:57 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
TimedOut,
|
|
|
|
/// An error returned when an operation could not be completed because a
|
|
|
|
/// call to `write` returned `Ok(0)`.
|
|
|
|
///
|
|
|
|
/// This typically means that an operation could only succeed if it wrote a
|
|
|
|
/// particular number of bytes but only a smaller number of bytes could be
|
|
|
|
/// written.
|
2015-03-16 20:08:57 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
WriteZero,
|
2015-03-16 20:08:57 -05:00
|
|
|
/// This operation was interrupted.
|
|
|
|
///
|
|
|
|
/// Interrupted operations can typically be retried.
|
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
Interrupted,
|
|
|
|
/// Any I/O error not part of this list.
|
2015-03-16 20:08:57 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
Other,
|
2015-03-16 20:08:57 -05:00
|
|
|
|
|
|
|
/// Any I/O error not part of this list.
|
|
|
|
#[unstable(feature = "std_misc",
|
|
|
|
reason = "better expressed through extensible enums that this \
|
|
|
|
enum cannot be exhaustively matched against")]
|
|
|
|
#[doc(hidden)]
|
|
|
|
__Nonexhaustive,
|
2015-01-31 22:24:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Error {
|
2015-03-31 18:01:03 -05:00
|
|
|
/// Creates a new I/O error from a known kind of error as well as an
|
|
|
|
/// arbitrary error payload.
|
|
|
|
///
|
|
|
|
/// This function is used to generically create I/O errors which do not
|
|
|
|
/// originate from the OS itself. The `error` argument is an arbitrary
|
|
|
|
/// payload which will be contained in this `Error`. Accessors as well as
|
|
|
|
/// downcasting will soon be added to this type as well to access the custom
|
|
|
|
/// information.
|
|
|
|
///
|
|
|
|
/// # Examples
|
|
|
|
///
|
|
|
|
/// ```
|
|
|
|
/// use std::io::{Error, ErrorKind};
|
|
|
|
///
|
|
|
|
/// // errors can be created from strings
|
|
|
|
/// let custom_error = Error::new(ErrorKind::Other, "oh no!");
|
|
|
|
///
|
|
|
|
/// // 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<E>(kind: ErrorKind, error: E) -> Error
|
2015-04-06 18:30:18 -05:00
|
|
|
where E: Into<Box<error::Error+Send+Sync>>
|
2015-03-31 18:01:03 -05:00
|
|
|
{
|
2015-01-31 22:24:36 -06:00
|
|
|
Error {
|
|
|
|
repr: Repr::Custom(Box::new(Custom {
|
|
|
|
kind: kind,
|
2015-03-31 18:01:03 -05:00
|
|
|
error: error.into(),
|
2015-01-31 22:24:36 -06:00
|
|
|
}))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// 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.
|
std: Stabilize the `io` module
The new `std::io` module has had some time to bake now, and this commit
stabilizes its functionality. There are still portions of the module which
remain unstable, and below contains a summart of the actions taken.
This commit also deprecates the entire contents of the `old_io` module in a
blanket fashion. All APIs should now have a reasonable replacement in the
new I/O modules.
Stable APIs:
* `std::io` (the name)
* `std::io::prelude` (the name)
* `Read`
* `Read::read`
* `Read::{read_to_end, read_to_string}` after being modified to return a `usize`
for the number of bytes read.
* `Write`
* `Write::write`
* `Write::{write_all, write_fmt}`
* `BufRead`
* `BufRead::{fill_buf, consume}`
* `BufRead::{read_line, read_until}` after being modified to return a `usize`
for the number of bytes read.
* `BufReader`
* `BufReader::{new, with_capacity}`
* `BufReader::{get_ref, get_mut, into_inner}`
* `{Read,BufRead} for BufReader`
* `BufWriter`
* `BufWriter::{new, with_capacity}`
* `BufWriter::{get_ref, get_mut, into_inner}`
* `Write for BufWriter`
* `IntoInnerError`
* `IntoInnerError::{error, into_inner}`
* `{Error,Display} for IntoInnerError`
* `LineWriter`
* `LineWriter::{new, with_capacity}` - `with_capacity` was added
* `LineWriter::{get_ref, get_mut, into_inner}` - `get_mut` was added)
* `Write for LineWriter`
* `BufStream`
* `BufStream::{new, with_capacities}`
* `BufStream::{get_ref, get_mut, into_inner}`
* `{BufRead,Read,Write} for BufStream`
* `stdin`
* `Stdin`
* `Stdin::lock`
* `Stdin::read_line` - added method
* `StdinLock`
* `Read for Stdin`
* `{Read,BufRead} for StdinLock`
* `stdout`
* `Stdout`
* `Stdout::lock`
* `StdoutLock`
* `Write for Stdout`
* `Write for StdoutLock`
* `stderr`
* `Stderr`
* `Stderr::lock`
* `StderrLock`
* `Write for Stderr`
* `Write for StderrLock`
* `io::Result`
* `io::Error`
* `io::Error::last_os_error`
* `{Display, Error} for Error`
Unstable APIs:
(reasons can be found in the commit itself)
* `Write::flush`
* `Seek`
* `ErrorKind`
* `Error::new`
* `Error::from_os_error`
* `Error::kind`
Deprecated APIs
* `Error::description` - available via the `Error` trait
* `Error::detail` - available via the `Display` implementation
* `thread::Builder::{stdout, stderr}`
Changes in functionality:
* `old_io::stdio::set_stderr` is now a noop as the infrastructure for printing
backtraces has migrated to `std::io`.
* The `ReadExt`, `WriteExt`, and `BufReadExt` extension traits were all removed
by folding functionality into the corresponding trait.
[breaking-change]
2015-03-11 16:16:46 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
pub fn last_os_error() -> Error {
|
2015-04-08 18:41:14 -05:00
|
|
|
Error::from_raw_os_error(sys::os::errno() as i32)
|
2015-01-31 22:24:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Creates a new instance of an `Error` from a particular OS error code.
|
2015-04-08 18:41:14 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
|
|
pub fn from_raw_os_error(code: i32) -> Error {
|
|
|
|
Error { repr: Repr::Os(code) }
|
|
|
|
}
|
|
|
|
|
2015-03-16 20:08:57 -05:00
|
|
|
/// Returns the OS error that this error represents (if any).
|
|
|
|
///
|
|
|
|
/// If this `Error` was constructed via `last_os_error` then this function
|
|
|
|
/// will return `Some`, otherwise it will return `None`.
|
2015-03-31 18:01:03 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-03-16 20:08:57 -05:00
|
|
|
pub fn raw_os_error(&self) -> Option<i32> {
|
|
|
|
match self.repr {
|
|
|
|
Repr::Os(i) => Some(i),
|
|
|
|
Repr::Custom(..) => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-13 09:21:32 -05:00
|
|
|
/// Returns the corresponding `ErrorKind` for this error.
|
std: Stabilize the `io` module
The new `std::io` module has had some time to bake now, and this commit
stabilizes its functionality. There are still portions of the module which
remain unstable, and below contains a summart of the actions taken.
This commit also deprecates the entire contents of the `old_io` module in a
blanket fashion. All APIs should now have a reasonable replacement in the
new I/O modules.
Stable APIs:
* `std::io` (the name)
* `std::io::prelude` (the name)
* `Read`
* `Read::read`
* `Read::{read_to_end, read_to_string}` after being modified to return a `usize`
for the number of bytes read.
* `Write`
* `Write::write`
* `Write::{write_all, write_fmt}`
* `BufRead`
* `BufRead::{fill_buf, consume}`
* `BufRead::{read_line, read_until}` after being modified to return a `usize`
for the number of bytes read.
* `BufReader`
* `BufReader::{new, with_capacity}`
* `BufReader::{get_ref, get_mut, into_inner}`
* `{Read,BufRead} for BufReader`
* `BufWriter`
* `BufWriter::{new, with_capacity}`
* `BufWriter::{get_ref, get_mut, into_inner}`
* `Write for BufWriter`
* `IntoInnerError`
* `IntoInnerError::{error, into_inner}`
* `{Error,Display} for IntoInnerError`
* `LineWriter`
* `LineWriter::{new, with_capacity}` - `with_capacity` was added
* `LineWriter::{get_ref, get_mut, into_inner}` - `get_mut` was added)
* `Write for LineWriter`
* `BufStream`
* `BufStream::{new, with_capacities}`
* `BufStream::{get_ref, get_mut, into_inner}`
* `{BufRead,Read,Write} for BufStream`
* `stdin`
* `Stdin`
* `Stdin::lock`
* `Stdin::read_line` - added method
* `StdinLock`
* `Read for Stdin`
* `{Read,BufRead} for StdinLock`
* `stdout`
* `Stdout`
* `Stdout::lock`
* `StdoutLock`
* `Write for Stdout`
* `Write for StdoutLock`
* `stderr`
* `Stderr`
* `Stderr::lock`
* `StderrLock`
* `Write for Stderr`
* `Write for StderrLock`
* `io::Result`
* `io::Error`
* `io::Error::last_os_error`
* `{Display, Error} for Error`
Unstable APIs:
(reasons can be found in the commit itself)
* `Write::flush`
* `Seek`
* `ErrorKind`
* `Error::new`
* `Error::from_os_error`
* `Error::kind`
Deprecated APIs
* `Error::description` - available via the `Error` trait
* `Error::detail` - available via the `Display` implementation
* `thread::Builder::{stdout, stderr}`
Changes in functionality:
* `old_io::stdio::set_stderr` is now a noop as the infrastructure for printing
backtraces has migrated to `std::io`.
* The `ReadExt`, `WriteExt`, and `BufReadExt` extension traits were all removed
by folding functionality into the corresponding trait.
[breaking-change]
2015-03-11 16:16:46 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
pub fn kind(&self) -> ErrorKind {
|
|
|
|
match self.repr {
|
|
|
|
Repr::Os(code) => sys::decode_error_kind(code),
|
|
|
|
Repr::Custom(ref c) => c.kind,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
std: Stabilize the `io` module
The new `std::io` module has had some time to bake now, and this commit
stabilizes its functionality. There are still portions of the module which
remain unstable, and below contains a summart of the actions taken.
This commit also deprecates the entire contents of the `old_io` module in a
blanket fashion. All APIs should now have a reasonable replacement in the
new I/O modules.
Stable APIs:
* `std::io` (the name)
* `std::io::prelude` (the name)
* `Read`
* `Read::read`
* `Read::{read_to_end, read_to_string}` after being modified to return a `usize`
for the number of bytes read.
* `Write`
* `Write::write`
* `Write::{write_all, write_fmt}`
* `BufRead`
* `BufRead::{fill_buf, consume}`
* `BufRead::{read_line, read_until}` after being modified to return a `usize`
for the number of bytes read.
* `BufReader`
* `BufReader::{new, with_capacity}`
* `BufReader::{get_ref, get_mut, into_inner}`
* `{Read,BufRead} for BufReader`
* `BufWriter`
* `BufWriter::{new, with_capacity}`
* `BufWriter::{get_ref, get_mut, into_inner}`
* `Write for BufWriter`
* `IntoInnerError`
* `IntoInnerError::{error, into_inner}`
* `{Error,Display} for IntoInnerError`
* `LineWriter`
* `LineWriter::{new, with_capacity}` - `with_capacity` was added
* `LineWriter::{get_ref, get_mut, into_inner}` - `get_mut` was added)
* `Write for LineWriter`
* `BufStream`
* `BufStream::{new, with_capacities}`
* `BufStream::{get_ref, get_mut, into_inner}`
* `{BufRead,Read,Write} for BufStream`
* `stdin`
* `Stdin`
* `Stdin::lock`
* `Stdin::read_line` - added method
* `StdinLock`
* `Read for Stdin`
* `{Read,BufRead} for StdinLock`
* `stdout`
* `Stdout`
* `Stdout::lock`
* `StdoutLock`
* `Write for Stdout`
* `Write for StdoutLock`
* `stderr`
* `Stderr`
* `Stderr::lock`
* `StderrLock`
* `Write for Stderr`
* `Write for StderrLock`
* `io::Result`
* `io::Error`
* `io::Error::last_os_error`
* `{Display, Error} for Error`
Unstable APIs:
(reasons can be found in the commit itself)
* `Write::flush`
* `Seek`
* `ErrorKind`
* `Error::new`
* `Error::from_os_error`
* `Error::kind`
Deprecated APIs
* `Error::description` - available via the `Error` trait
* `Error::detail` - available via the `Display` implementation
* `thread::Builder::{stdout, stderr}`
Changes in functionality:
* `old_io::stdio::set_stderr` is now a noop as the infrastructure for printing
backtraces has migrated to `std::io`.
* The `ReadExt`, `WriteExt`, and `BufReadExt` extension traits were all removed
by folding functionality into the corresponding trait.
[breaking-change]
2015-03-11 16:16:46 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-01-31 22:24:36 -06:00
|
|
|
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)
|
|
|
|
}
|
2015-03-31 18:01:03 -05:00
|
|
|
Repr::Custom(ref c) => c.error.fmt(fmt),
|
2015-01-31 22:24:36 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
std: Stabilize the `io` module
The new `std::io` module has had some time to bake now, and this commit
stabilizes its functionality. There are still portions of the module which
remain unstable, and below contains a summart of the actions taken.
This commit also deprecates the entire contents of the `old_io` module in a
blanket fashion. All APIs should now have a reasonable replacement in the
new I/O modules.
Stable APIs:
* `std::io` (the name)
* `std::io::prelude` (the name)
* `Read`
* `Read::read`
* `Read::{read_to_end, read_to_string}` after being modified to return a `usize`
for the number of bytes read.
* `Write`
* `Write::write`
* `Write::{write_all, write_fmt}`
* `BufRead`
* `BufRead::{fill_buf, consume}`
* `BufRead::{read_line, read_until}` after being modified to return a `usize`
for the number of bytes read.
* `BufReader`
* `BufReader::{new, with_capacity}`
* `BufReader::{get_ref, get_mut, into_inner}`
* `{Read,BufRead} for BufReader`
* `BufWriter`
* `BufWriter::{new, with_capacity}`
* `BufWriter::{get_ref, get_mut, into_inner}`
* `Write for BufWriter`
* `IntoInnerError`
* `IntoInnerError::{error, into_inner}`
* `{Error,Display} for IntoInnerError`
* `LineWriter`
* `LineWriter::{new, with_capacity}` - `with_capacity` was added
* `LineWriter::{get_ref, get_mut, into_inner}` - `get_mut` was added)
* `Write for LineWriter`
* `BufStream`
* `BufStream::{new, with_capacities}`
* `BufStream::{get_ref, get_mut, into_inner}`
* `{BufRead,Read,Write} for BufStream`
* `stdin`
* `Stdin`
* `Stdin::lock`
* `Stdin::read_line` - added method
* `StdinLock`
* `Read for Stdin`
* `{Read,BufRead} for StdinLock`
* `stdout`
* `Stdout`
* `Stdout::lock`
* `StdoutLock`
* `Write for Stdout`
* `Write for StdoutLock`
* `stderr`
* `Stderr`
* `Stderr::lock`
* `StderrLock`
* `Write for Stderr`
* `Write for StderrLock`
* `io::Result`
* `io::Error`
* `io::Error::last_os_error`
* `{Display, Error} for Error`
Unstable APIs:
(reasons can be found in the commit itself)
* `Write::flush`
* `Seek`
* `ErrorKind`
* `Error::new`
* `Error::from_os_error`
* `Error::kind`
Deprecated APIs
* `Error::description` - available via the `Error` trait
* `Error::detail` - available via the `Display` implementation
* `thread::Builder::{stdout, stderr}`
Changes in functionality:
* `old_io::stdio::set_stderr` is now a noop as the infrastructure for printing
backtraces has migrated to `std::io`.
* The `ReadExt`, `WriteExt`, and `BufReadExt` extension traits were all removed
by folding functionality into the corresponding trait.
[breaking-change]
2015-03-11 16:16:46 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
|
|
impl error::Error for Error {
|
2015-01-31 22:24:36 -06:00
|
|
|
fn description(&self) -> &str {
|
|
|
|
match self.repr {
|
|
|
|
Repr::Os(..) => "os error",
|
2015-03-31 18:01:03 -05:00
|
|
|
Repr::Custom(ref c) => c.error.description(),
|
2015-01-31 22:24:36 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-04-06 18:30:18 -05:00
|
|
|
|
|
|
|
fn _assert_error_is_sync_send() {
|
|
|
|
fn _is_sync_send<T: Sync+Send>() {}
|
|
|
|
_is_sync_send::<Error>();
|
|
|
|
}
|