pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-09 21:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

MapVisitor::end and SeqVisitor::end were mostly never called

Browse Source
This commit is contained in:
Oliver Schneider
2015-03-16 13:20:34 +01:00
parent f4f8194f46
commit f21cbb71e2
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_de.rs
+11 -6
View File
@@ -184,12 +184,13 @@ impl<'a, 'b> de::SeqVisitor for TokenDeserializerSeqVisitor<'a, 'b> {
let first = self.first;
self.first = false;
match self.de.tokens.next() {
Some(Token::SeqSep(first_)) if first_ == first => {
match self.de.tokens.peek() {
Some(&Token::SeqSep(first_)) if first_ == first => {
self.len -= 1;
self.de.tokens.next();
Ok(Some(try!(Deserialize::deserialize(self.de))))
}
Some(Token::SeqEnd) => Ok(None),
Some(&Token::SeqEnd) => Ok(None),
Some(_) => {
Err(Error::SyntaxError)
}
@@ -198,6 +199,7 @@ impl<'a, 'b> de::SeqVisitor for TokenDeserializerSeqVisitor<'a, 'b> {
}
fn end(&mut self) -> Result<(), Error> {
assert_eq!(self.len, 0);
match self.de.tokens.next() {
Some(Token::SeqEnd) => Ok(()),
Some(_) => Err(Error::SyntaxError),
@@ -227,11 +229,13 @@ impl<'a, 'b> de::MapVisitor for TokenDeserializerMapVisitor<'a, 'b> {
let first = self.first;
self.first = false;
match self.de.tokens.next() {
Some(Token::MapSep(first_)) if first_ == first => {
match self.de.tokens.peek() {
Some(&Token::MapSep(first_)) if first_ == first => {
self.de.tokens.next();
self.len -= 1;
Ok(Some(try!(Deserialize::deserialize(self.de))))
}
Some(Token::MapEnd) => Ok(None),
Some(&Token::MapEnd) => Ok(None),
Some(_) => Err(Error::SyntaxError),
None => Err(Error::EndOfStreamError),
}
@@ -244,6 +248,7 @@ impl<'a, 'b> de::MapVisitor for TokenDeserializerMapVisitor<'a, 'b> {
}
fn end(&mut self) -> Result<(), Error> {
assert_eq!(self.len, 0);
match self.de.tokens.next() {
Some(Token::MapEnd) => Ok(()),
Some(_) => Err(Error::SyntaxError),