From ddda360fecb4169a8ee406eb59a547542916b9b2 Mon Sep 17 00:00:00 2001 From: derhaskell Date: Mon, 13 Apr 2015 13:27:15 +0200 Subject: [PATCH 1/3] Update README.md fixes struct serialization example for rust 1.0.0-beta --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8037ec9f..ec6d6425 100644 --- a/README.md +++ b/README.md @@ -198,18 +198,18 @@ struct PointMapVisitor<'a> { state: u8, } -impl<'a> serde::ser::MapVisitor for PointMapVisitor { - fn visit(&mut self, serializer: &mut S) -> Result +impl<'a> serde::ser::MapVisitor for PointMapVisitor<'a> { + fn visit(&mut self, serializer: &mut S) -> Result, S::Error> where S: serde::Serializer { match self.state { 0 => { self.state += 1; - Ok(Some(try!(serializer.visit_map_elt("x", &self.x))) + Ok(Some(try!(serializer.visit_map_elt("x", &self.value.x))) } 1 => { self.state += 1; - Ok(Some(try!(serializer.visit_map_elt("y", &self.y)))) + Ok(Some(try!(serializer.visit_map_elt("y", &self.value.y)))) } _ => { Ok(None) From aa16ecf4d3360e5c88af1ea68614ae914ad281d5 Mon Sep 17 00:00:00 2001 From: derhaskell Date: Mon, 13 Apr 2015 13:28:47 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec6d6425..35f98236 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ impl<'a> serde::ser::MapVisitor for PointMapVisitor<'a> { match self.state { 0 => { self.state += 1; - Ok(Some(try!(serializer.visit_map_elt("x", &self.value.x))) + Ok(Some(try!(serializer.visit_map_elt("x", &self.value.x)))) } 1 => { self.state += 1; From becb8c48e8562f4b472c216eba7eafc03ecf6b4e Mon Sep 17 00:00:00 2001 From: derhaskell Date: Mon, 13 Apr 2015 13:37:06 +0200 Subject: [PATCH 3/3] fixes typo in deserialization example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 35f98236..fa58f111 100644 --- a/README.md +++ b/README.md @@ -233,7 +233,7 @@ can create the `i32` from a variety of different types: ```rust impl Deserialize for i32 { - fn deserialize(deserializer: &mut D) -> Result<$ty, D::Error> + fn deserialize(deserializer: &mut D) -> Result where D: serde::Deserializer, { deserializer.visit(I32Visitor)