pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-26 10:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests, make Deserializer::visit take a value not a reference

Browse Source
This commit is contained in:
Erick Tryzelaar
2015-03-03 09:50:57 -08:00
parent 9904d32ff9
commit 1182ad0223
6 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde2/src/json/de.rs
+3 -3
View File
@@ -83,7 +83,7 @@ impl<Iter: Iterator<Item=u8>> Deserializer<Iter> {
#[inline]
fn parse_value<
V: de::Visitor,
>(&mut self, visitor: &mut V) -> Result<V::Value, Error> {
>(&mut self, mut visitor: V) -> Result<V::Value, Error> {
self.parse_whitespace();
if self.eof() {
@@ -142,7 +142,7 @@ impl<Iter: Iterator<Item=u8>> Deserializer<Iter> {
#[inline]
fn parse_number<
V: de::Visitor,
>(&mut self, visitor: &mut V) -> Result<V::Value, Error> {
>(&mut self, mut visitor: V) -> Result<V::Value, Error> {
let mut neg = 1;
if self.ch_is(b'-') {
@@ -389,7 +389,7 @@ impl<Iter: Iterator<Item=u8>> de::Deserializer for Deserializer<Iter> {
#[inline]
fn visit<
V: de::Visitor,
>(&mut self, visitor: &mut V) -> Result<V::Value, Error> {
>(&mut self, visitor: V) -> Result<V::Value, Error> {
self.parse_value(visitor)
}
}
serde2/src/json/value.rs
+2 -2
View File
@@ -267,7 +267,7 @@ impl de::Deserializer for Deserializer {
#[inline]
fn visit<
V: de::Visitor,
>(&mut self, visitor: &mut V) -> Result<V::Value, Error> {
>(&mut self, mut visitor: V) -> Result<V::Value, Error> {
let value = match self.value.take() {
Some(value) => value,
None => { return Err(de::Error::end_of_stream_error()); }
@@ -302,7 +302,7 @@ impl de::Deserializer for Deserializer {
#[inline]
fn visit_option<
V: de::Visitor,
>(&mut self, visitor: &mut V) -> Result<V::Value, Error> {
>(&mut self, mut visitor: V) -> Result<V::Value, Error> {
match self.value {
Some(Value::Null) => visitor.visit_none(),
Some(_) => visitor.visit_some(self),