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

Flesh out error handling

Browse Source
This commit is contained in:
Erick Tryzelaar
2014-08-06 22:24:06 -04:00
parent 005b124cd3
commit 98aa2e7884
8 changed files with 290 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/json/mod.rs
+19 -3
View File
@@ -526,7 +526,7 @@ impl de::Deserializable for Json {
object.insert(name.to_string(), List(fields));
Ok(Object(object))
}
de::End => Err(d.syntax_error(de::End)),
de::End => Err(d.syntax_error(de::End, [de::EndKind])),
}
}
}
@@ -615,7 +615,15 @@ impl de::Deserializer<ParserError> for JsonDeserializer {
SyntaxError(EOFWhileParsingValue, 0, 0)
}
fn syntax_error(&self, _token: de::Token) -> ParserError {
fn syntax_error(&self, _token: de::Token, _expected: &[de::TokenKind]) -> ParserError {
SyntaxError(InvalidSyntax, 0, 0)
}
fn unexpected_name_error(&self, _token: de::Token) -> ParserError {
SyntaxError(InvalidSyntax, 0, 0)
}
fn conversion_error(&self, _token: de::Token) -> ParserError {
SyntaxError(InvalidSyntax, 0, 0)
}
@@ -1981,7 +1989,15 @@ impl<T: Iterator<char>> de::Deserializer<ParserError> for Parser<T> {
SyntaxError(EOFWhileParsingValue, self.line, self.col)
}
fn syntax_error(&self, _token: de::Token) -> ParserError {
fn syntax_error(&self, _token: de::Token, _expected: &[de::TokenKind]) -> ParserError {
SyntaxError(InvalidSyntax, self.line, self.col)
}
fn unexpected_name_error(&self, _token: de::Token) -> ParserError {
SyntaxError(InvalidSyntax, self.line, self.col)
}
fn conversion_error(&self, _token: de::Token) -> ParserError {
SyntaxError(InvalidSyntax, self.line, self.col)
}