mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #724 from serde-rs/entry

Browse Source 
SerializeMap::serialize_entry
This commit is contained in:
David Tolnay 2017-01-28 09:08:51 -08:00 committed by GitHub
commit f2402dcf52
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
serde/src/ser/impls.rs
View File

@ -568,8 +568,7 @@ macro_rules! serialize_map {
use super::SerializeMap; use super::SerializeMap;
let mut map = try!(serializer.serialize_map(Some(self.len()))); let mut map = try!(serializer.serialize_map(Some(self.len())));
for (k, v) in self { for (k, v) in self {
try!(map.serialize_key(k)); try!(map.serialize_entry(k, v));
try!(map.serialize_value(v));
} }
map.end() map.end()
} }

28
serde/src/ser/mod.rs
View File

@ -546,8 +546,7 @@ pub trait Serializer {
/// ```rust,ignore /// ```rust,ignore
/// let mut map = serializer.serialize_map(Some(self.len()))?; /// let mut map = serializer.serialize_map(Some(self.len()))?;
/// for (k, v) in self { /// for (k, v) in self {
/// map.serialize_key(k)?; /// map.serialize_entry(k, v)?;
/// map.serialize_value(v)?;
/// } /// }
/// map.end() /// map.end()
/// ``` /// ```
@ -705,8 +704,7 @@ pub trait SerializeTupleVariant {
/// ```rust,ignore /// ```rust,ignore
/// let mut map = serializer.serialize_map(Some(self.len()))?; /// let mut map = serializer.serialize_map(Some(self.len()))?;
/// for (k, v) in self { /// for (k, v) in self {
/// map.serialize_key(k)?; /// map.serialize_entry(k, v)?;
/// map.serialize_value(v)?;
/// } /// }
/// map.end() /// map.end()
/// ``` /// ```
@ -723,6 +721,28 @@ pub trait SerializeMap {
/// Serialize a map value. /// Serialize a map value.
fn serialize_value<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), Self::Error>; fn serialize_value<T: ?Sized + Serialize>(&mut self, value: &T) -> Result<(), Self::Error>;
/// Serialize a map entry consisting of a key and a value.
///
/// Some `Serialize` types are not able to hold a key and value in memory at
/// the same time so `SerializeMap` implementations are required to support
/// `serialize_key` and `serialize_value` individually. The
/// `serialize_entry` method allows serializers to optimize for the case
/// where key and value are both available. `Serialize` implementations are
/// encouraged to use `serialize_entry` if possible.
///
/// The default implementation delegates to `serialize_key` and
/// `serialize_value`. This is appropriate for serializers that do not care
/// about performance or are not able to optimize `serialize_entry` any
/// better than this.
fn serialize_entry<K: ?Sized + Serialize, V: ?Sized + Serialize>(
&mut self,
key: &K,
value: &V,
) -> Result<(), Self::Error> {
try!(self.serialize_key(key));
self.serialize_value(value)
}
/// Finish serializing a map. /// Finish serializing a map.
fn end(self) -> Result<Self::Ok, Self::Error>; fn end(self) -> Result<Self::Ok, Self::Error>;
} }