diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 11:27:21 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 15:53:39 -0700 |
| commit | e10ee2c8572421c056ea68e6656fee936e0330d8 (patch) | |
| tree | b66a0ecb48f039e3789837fd45d83d4461fb1035 /src/libstd/io | |
| parent | da04788efca6ec1e421139fb4916a5aacd49a2e2 (diff) | |
| parent | e17f4fc1d4545f5c17b21805c5145b05495484ee (diff) | |
| download | rust-e10ee2c8572421c056ea68e6656fee936e0330d8.tar.gz rust-e10ee2c8572421c056ea68e6656fee936e0330d8.zip | |
rollup merge of #23879: seanmonstar/del-from-error
Conflicts: src/libcore/error.rs
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/buffered.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 8eea06bf6b0..628ad839c16 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -16,7 +16,7 @@ use prelude::v1::*; use io::prelude::*; use cmp; -use error::{self, FromError}; +use error; use fmt; use io::{self, DEFAULT_BUF_SIZE, Error, ErrorKind}; use ptr; @@ -264,8 +264,8 @@ impl<W> IntoInnerError<W> { } #[stable(feature = "rust1", since = "1.0.0")] -impl<W> FromError<IntoInnerError<W>> for Error { - fn from_error(iie: IntoInnerError<W>) -> Error { iie.1 } +impl<W> From<IntoInnerError<W>> for Error { + fn from(iie: IntoInnerError<W>) -> Error { iie.1 } } #[stable(feature = "rust1", since = "1.0.0")] |