Replace FromError with From

As per rust-lang/rust#23879.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

src/image.rs

@@ -1,4 +1,3 @@
-use std::error::FromError;
 use std::fmt;
 use std::mem;
 use std::io;
@@ -58,14 +57,14 @@ impl fmt::Display for ImageError {
     }
 }
 
-impl FromError<io::Error> for ImageError {
-    fn from_error(err: io::Error) -> ImageError {
+impl From<io::Error> for ImageError {
+    fn from(err: io::Error) -> ImageError {
         ImageError::IoError(err)
     }
 }
 
-impl FromError<byteorder::Error> for ImageError {
-    fn from_error(err: byteorder::Error) -> ImageError {
+impl From<byteorder::Error> for ImageError {
+    fn from(err: byteorder::Error) -> ImageError {
         match err {
             byteorder::Error::UnexpectedEOF => ImageError::ImageEnd,
             byteorder::Error::Io(err) => ImageError::IoError(err),