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

Correctly suppress the end() call for flattened serialization

Browse Source
This commit is contained in:
Armin Ronacher
2018-03-15 22:21:11 +01:00
parent b692923321
commit 112dfd7428
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/private/ser.rs
+12 -12
View File
@@ -1050,16 +1050,16 @@ where
impl<'a, M> Serializer for FlatMapSerializer<'a, M> impl<'a, M> Serializer for FlatMapSerializer<'a, M>
where M: SerializeMap + 'a where M: SerializeMap + 'a
{ {
type Ok = M::Ok; type Ok = ();
type Error = M::Error; type Error = M::Error;
type SerializeSeq = Impossible<M::Ok, M::Error>; type SerializeSeq = Impossible<Self::Ok, M::Error>;
type SerializeTuple = Impossible<M::Ok, M::Error>; type SerializeTuple = Impossible<Self::Ok, M::Error>;
type SerializeTupleStruct = Impossible<M::Ok, M::Error>; type SerializeTupleStruct = Impossible<Self::Ok, M::Error>;
type SerializeMap = FlatMapSerializeMap<'a, M>; type SerializeMap = FlatMapSerializeMap<'a, M>;
type SerializeStruct = FlatMapSerializeStruct<'a, M>; type SerializeStruct = FlatMapSerializeStruct<'a, M>;
type SerializeTupleVariant = Impossible<M::Ok, M::Error>; type SerializeTupleVariant = Impossible<Self::Ok, M::Error>;
type SerializeStructVariant = Impossible<M::Ok, M::Error>; type SerializeStructVariant = Impossible<Self::Ok, M::Error>;
fn serialize_bool(self, _: bool) -> Result<Self::Ok, Self::Error> { fn serialize_bool(self, _: bool) -> Result<Self::Ok, Self::Error> {
Err(self.bad_type(Unsupported::Boolean)) Err(self.bad_type(Unsupported::Boolean))
@@ -1226,7 +1226,7 @@ pub struct FlatMapSerializeMap<'a, M: 'a>(&'a mut M);
impl<'a, M> ser::SerializeMap for FlatMapSerializeMap<'a, M> impl<'a, M> ser::SerializeMap for FlatMapSerializeMap<'a, M>
where M: SerializeMap + 'a where M: SerializeMap + 'a
{ {
type Ok = M::Ok; type Ok = ();
type Error = M::Error; type Error = M::Error;
fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error> fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
@@ -1243,8 +1243,8 @@ impl<'a, M> ser::SerializeMap for FlatMapSerializeMap<'a, M>
self.0.serialize_value(value) self.0.serialize_value(value)
} }
fn end(self) -> Result<M::Ok, Self::Error> { fn end(self) -> Result<(), Self::Error> {
self.0.end() Ok(())
} }
} }
@@ -1255,7 +1255,7 @@ pub struct FlatMapSerializeStruct<'a, M: 'a>(&'a mut M);
impl<'a, M> ser::SerializeStruct for FlatMapSerializeStruct<'a, M> impl<'a, M> ser::SerializeStruct for FlatMapSerializeStruct<'a, M>
where M: SerializeMap + 'a where M: SerializeMap + 'a
{ {
type Ok = M::Ok; type Ok = ();
type Error = M::Error; type Error = M::Error;
fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error> fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
@@ -1265,7 +1265,7 @@ impl<'a, M> ser::SerializeStruct for FlatMapSerializeStruct<'a, M>
self.0.serialize_entry(key, value) self.0.serialize_entry(key, value)
} }
fn end(self) -> Result<M::Ok, Self::Error> { fn end(self) -> Result<(), Self::Error> {
self.0.end() Ok(())
} }
} }