bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #23879: seanmonstar/del-from-error

Browse source 
Conflicts:
	src/libcore/error.rs
This commit is contained in:
Alex Crichton 2015-03-31 11:27:21 -07:00
commit e10ee2c857
10 changed files with 26 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libserialize/json.rs
View file

@ -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>;