Merge pull request #614 from jmfiaschi/map-serialize-entry

replace serialize key,value functions by serialize_entry
serde-rs · Feb 2, 2020 · 1059dc3 · 1059dc3
2 parents a03d5ff + 0b43936
commit 1059dc3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/src/map.rs b/src/map.rs
@@ -307,8 +307,7 @@ impl ser::Serialize for Map<String, Value> {
         use serde::ser::SerializeMap;
         let mut map = tri!(serializer.serialize_map(Some(self.len())));
         for (k, v) in self {
-            tri!(map.serialize_key(k));
-            tri!(map.serialize_value(v));
+            map.serialize_entry(k, v)?;
         }
         map.end()
     }

diff --git a/src/ser.rs b/src/ser.rs
@@ -730,6 +730,17 @@ where
         }
     }
 
+    #[inline]
+    fn serialize_entry<K: ?Sized, V: ?Sized>(&mut self, key: &K, value: &V) -> Result<()>
+    where
+        K: Serialize,
+        V: Serialize,
+    {
+        self.serialize_key(key)?;
+        self.serialize_value(value)?;
+        Ok(())
+    }
+
     #[inline]
     fn end(self) -> Result<()> {
         match self {
@@ -762,10 +773,7 @@ where
         T: Serialize,
     {
         match *self {
-            Compound::Map { .. } => {
-                tri!(ser::SerializeMap::serialize_key(self, key));
-                ser::SerializeMap::serialize_value(self, value)
-            }
+            Compound::Map { .. } => ser::SerializeMap::serialize_entry(self, key, value),
             #[cfg(feature = "arbitrary_precision")]
             Compound::Number { ref mut ser, .. } => {
                 if key == crate::number::TOKEN {

diff --git a/src/value/ser.rs b/src/value/ser.rs
@@ -24,8 +24,7 @@ impl Serialize for Value {
                 use serde::ser::SerializeMap;
                 let mut map = tri!(serializer.serialize_map(Some(m.len())));
                 for (k, v) in m {
-                    tri!(map.serialize_key(k));
-                    tri!(map.serialize_value(v));
+                    map.serialize_entry(k, v)?;
                 }
                 map.end()
             }
@@ -601,10 +600,7 @@ impl serde::ser::SerializeStruct for SerializeMap {
         T: Serialize,
     {
         match *self {
-            SerializeMap::Map { .. } => {
-                tri!(serde::ser::SerializeMap::serialize_key(self, key));
-                serde::ser::SerializeMap::serialize_value(self, value)
-            }
+            SerializeMap::Map { .. } => serde::ser::SerializeMap::serialize_entry(self, key, value),
             #[cfg(feature = "arbitrary_precision")]
             SerializeMap::Number { ref mut out_value } => {
                 if key == crate::number::TOKEN {

diff --git a/tests/test.rs b/tests/test.rs
@@ -1467,8 +1467,7 @@ fn test_serialize_map_with_no_len() {
             use serde::ser::SerializeMap;
             let mut map = serializer.serialize_map(None)?;
             for (k, v) in &self.0 {
-                map.serialize_key(k)?;
-                map.serialize_value(v)?;
+                map.serialize_entry(k, v)?;
             }
             map.end()
         }