Replace FromError with From

As per rust-lang/rust#23879. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
gbersac · May 8, 2015 · 99c3df7 · 99c3df7
1 parent 3cb96f8
commit 99c3df7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/json.rs b/src/json.rs
@@ -411,8 +411,8 @@ impl fmt::Display for EncoderError {
     }
 }
 
-impl std::error::FromError<fmt::Error> for EncoderError {
-    fn from_error(err: fmt::Error) -> EncoderError { EncoderError::FmtError(err) }
+impl From<fmt::Error> for EncoderError {
+    fn from(err: fmt::Error) -> EncoderError { EncoderError::FmtError(err) }
 }
 
 pub type EncodeResult<T> = Result<T, EncoderError>;