diff --git a/src/new.rs b/src/new.rs index 1eac46a..f639ea2 100644 --- a/src/new.rs +++ b/src/new.rs @@ -26,12 +26,12 @@ pub enum Error { Io(io::Error), } -impl error::FromError for Error { - fn from_error(err: io::Error) -> Error { Error::Io(err) } +impl From for Error { + fn from(err: io::Error) -> Error { Error::Io(err) } } -impl error::FromError for io::Error { - fn from_error(err: Error) -> io::Error { +impl From for io::Error { + fn from(err: Error) -> io::Error { match err { Error::Io(err) => err, Error::UnexpectedEOF => io::Error::new(io::ErrorKind::Other, @@ -188,14 +188,14 @@ fn read_full(rdr: &mut R, buf: &mut [u8]) -> Result<()> { Ok(0) => return Err(Error::UnexpectedEOF), Ok(n) => nread += n, Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}, - Err(e) => return Err(error::FromError::from_error(e)) + Err(e) => return Err(From::from(e)) } } Ok(()) } fn write_all(wtr: &mut W, buf: &[u8]) -> Result<()> { - wtr.write_all(buf).map_err(error::FromError::from_error) + wtr.write_all(buf).map_err(From::from) } /// Extends `Write` with methods for writing numbers. (For `std::io`.)