mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follow rust std: Error requires an implementation of fmt::Display

Browse Source
This commit is contained in:
Thomas Bahn 2015-02-06 15:37:02 +01:00
parent 5782657502
commit cb8492d74b
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
serde2/src/json/error.rs
View File

@ -91,7 +91,7 @@ impl error::Error for Error {
fn description(&self) -> &str {
match *self {
Error::SyntaxError(..) => "syntax error",
Error::IoError(ref error) => error.description(),
Error::IoError(_) => "input/output error",
/*
Error::ExpectedError(ref expected, _) => &expected,
Error::MissingFieldError(_) => "missing field",
@ -100,12 +100,15 @@ impl error::Error for Error {
}
}
fn detail(&self) -> Option<String> {
}
impl fmt::Display for Error {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
match *self {
Error::SyntaxError(ref code, line, col) => {
Some(format!("{:?} at line {:?} column {:?}", code, line, col))
write!(fmt, "{:?} at line {:?} column {:?}", code, line, col)
}
Error::IoError(ref error) => error.detail(),
Error::IoError(ref error) => fmt::Display::fmt(error, fmt),
/*
Error::ExpectedError(ref expected, ref found) => {
Some(format!("expected {}, found {}", expected, found))

16
src/json/error.rs
View File

@ -92,27 +92,29 @@ impl error::Error for Error {
fn description(&self) -> &str {
match *self {
Error::SyntaxError(..) => "syntax error",
Error::IoError(ref error) => error.description(),
Error::IoError(_) => "Input/Output error",
Error::ExpectedError(ref expected, _) => &expected,
Error::MissingFieldError(_) => "missing field",
Error::UnknownVariantError(_) => "unknown variant",
}
}
}
fn detail(&self) -> Option<String> {
impl fmt::Display for Error {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
match *self {
Error::SyntaxError(ref code, line, col) => {
Some(format!("{:?} at line {:?} column {:?}", code, line, col))
write!(fmt, "{:?} at line {:?} column {:?}", code, line, col)
}
Error::IoError(ref error) => error.detail(),
Error::IoError(ref error) => fmt::Display::fmt(error, fmt),
Error::ExpectedError(ref expected, ref found) => {
Some(format!("expected {:?}, found {:?}", expected, found))
write!(fmt, "expected {:?}, found {:?}", expected, found)
}
Error::MissingFieldError(ref field) => {
Some(format!("missing field {:?}", field))
write!(fmt, "missing field {:?}", field)
}
Error::UnknownVariantError(ref variant) => {
Some(format!("unknown variant {:?}", variant))
write!(fmt, "unknown variant {:?}", variant)
}
}
}