pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-07-04 07:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

start cleaning up error handling

Browse Source
This commit is contained in:
Erick Tryzelaar
2014-05-30 23:28:46 -07:00
parent ea5936aa78
commit c58958b1c8
6 changed files with 83 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bench_struct.rs
+10 -10
View File
@@ -56,7 +56,7 @@ impl<E, D: Deserializer<E>> Deserializable<E, D> for Inner {
_ => { }
}
}
_ => { return Err(d.syntax_error()); }
_ => { return d.syntax_error(); }
}
}
@@ -64,10 +64,10 @@ impl<E, D: Deserializer<E>> Deserializable<E, D> for Inner {
(Some(a), Some(b), Some(c)) => {
Ok(Inner { a: a, b: b, c: c })
}
_ => Err(d.syntax_error()),
_ => d.syntax_error(),
}
}
_ => Err(d.syntax_error()),
_ => d.syntax_error(),
}
}
}
@@ -106,7 +106,7 @@ impl<E, D: Deserializer<E>> Deserializable<E, D> for Outer {
_ => { }
}
}
_ => { return Err(d.syntax_error()); }
_ => { return d.syntax_error(); }
}
}
@@ -114,10 +114,10 @@ impl<E, D: Deserializer<E>> Deserializable<E, D> for Outer {
Some(inner) => {
Ok(Outer { inner: inner })
}
_ => Err(d.syntax_error()),
_ => d.syntax_error(),
}
}
_ => Err(d.syntax_error()),
_ => d.syntax_error(),
}
}
}
@@ -446,13 +446,13 @@ mod deserializer {
impl Deserializer<Error> for OuterDeserializer {
#[inline]
fn end_of_stream_error(&self) -> Error {
EndOfStream
fn end_of_stream_error<T>(&self) -> Result<T, Error> {
Err(EndOfStream)
}
#[inline]
fn syntax_error(&self) -> Error {
SyntaxError
fn syntax_error<T>(&self) -> Result<T, Error> {
Err(SyntaxError)
}
}
}