Replace FromError with From

andersk · gbersac · commit 99c3df725b82 · 2015-05-08T22:44:42.000+02:00
As per rust-lang/rust#23879. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
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>;

Original file line number	Diff line number	Diff line change
`@@ -411,8 +411,8 @@ impl fmt::Display for EncoderError {`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`
`414`		`-impl std::error::FromError<fmt::Error> for EncoderError {`
`415`		`- fn from_error(err: fmt::Error) -> EncoderError { EncoderError::FmtError(err) }`
	`414`	`+impl From<fmt::Error> for EncoderError {`
	`415`	`+ fn from(err: fmt::Error) -> EncoderError { EncoderError::FmtError(err) }`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`pub type EncodeResult<T> = Result<T, EncoderError>;`