Fixup serialize_entry PR

serde-rs · Feb 2, 2020 · 5263b6f · 5263b6f
1 parent 1059dc3
commit 5263b6f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/src/map.rs b/src/map.rs
@@ -307,7 +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 {
-            map.serialize_entry(k, v)?;
+            tri!(map.serialize_entry(k, v));
         }
         map.end()
     }

diff --git a/src/ser.rs b/src/ser.rs
@@ -730,17 +730,6 @@ 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 {

diff --git a/src/value/ser.rs b/src/value/ser.rs
@@ -24,7 +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 {
-                    map.serialize_entry(k, v)?;
+                    tri!(map.serialize_entry(k, v));
                 }
                 map.end()
             }