itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-10-02 07:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix clippy lints in serde_test

Browse Source
This commit is contained in:
David Tolnay 2017-01-25 20:42:44 -08:00
parent 68aab2424f
commit 87040b4bc4
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
serde_test/src/de.rs
View File

@ -273,7 +273,7 @@ impl<'a, I> de::Deserializer for &'a mut Deserializer<I>
where V: Visitor, where V: Visitor,
{ {
match self.tokens.peek() { match self.tokens.peek() {
Some(&Token::Option(false)) => { Some(&Token::Unit) | Some(&Token::Option(false)) => {
self.tokens.next(); self.tokens.next();
visitor.visit_none() visitor.visit_none()
} }
@ -281,10 +281,6 @@ impl<'a, I> de::Deserializer for &'a mut Deserializer<I>
self.tokens.next(); self.tokens.next();
visitor.visit_some(self) visitor.visit_some(self)
} }
Some(&Token::Unit) => {
self.tokens.next();
visitor.visit_none()
}
Some(_) => visitor.visit_some(self), Some(_) => visitor.visit_some(self),
None => Err(Error::EndOfTokens), None => Err(Error::EndOfTokens),
} }
@ -316,7 +312,7 @@ impl<'a, I> de::Deserializer for &'a mut Deserializer<I>
let token = self.tokens.next().unwrap(); let token = self.tokens.next().unwrap();
Err(Error::UnexpectedToken(token)) Err(Error::UnexpectedToken(token))
} }
None => { return Err(Error::EndOfTokens); } None => Err(Error::EndOfTokens),
} }
} }
@ -377,11 +373,7 @@ impl<'a, I> de::Deserializer for &'a mut Deserializer<I>
where V: Visitor, where V: Visitor,
{ {
match self.tokens.peek() { match self.tokens.peek() {
Some(&Token::Unit) => { Some(&Token::Unit) | Some(&Token::UnitStruct(_)) => {
self.tokens.next();
visitor.visit_unit()
}
Some(&Token::UnitStruct(_)) => {
self.tokens.next(); self.tokens.next();
visitor.visit_unit() visitor.visit_unit()
} }