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/libserialize/json.rs | |
| 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/libserialize/json.rs')
| -rw-r--r-- | src/libserialize/json.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index c47568520a0..cdfe212bf23 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -367,8 +367,8 @@ impl std::error::Error for EncoderError { fn description(&self) -> &str { "encoder error" } } -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 = Result<(), EncoderError>; |