refactor(toml): Pull out ValueSerializer for easier comparison

Author: epage

crates/toml/src/ser/array.rs

@@ -1,6 +1,5 @@
 use super::write_document;
-use super::write_value;
-use super::{Error, Serializer, ValueSerializer};
+use super::{Error, Serializer};
 use crate::fmt::DocumentFormatter;
 
 type InnerSerializeDocumentSeq =
@@ -86,84 +85,3 @@ impl serde::ser::SerializeTupleStruct for SerializeDocumentArray<'_> {
         write_document(self.dst, self.settings, self.inner.end())
     }
 }
-
-type InnerSerializeValueSeq = <toml_edit::ser::ValueSerializer as serde::Serializer>::SerializeSeq;
-
-#[doc(hidden)]
-pub struct SerializeValueArray<'d> {
-    inner: InnerSerializeValueSeq,
-    dst: &'d mut String,
-}
-
-impl<'d> SerializeValueArray<'d> {
-    pub(crate) fn new(ser: ValueSerializer<'d>, inner: InnerSerializeValueSeq) -> Self {
-        Self {
-            inner,
-            dst: ser.dst,
-        }
-    }
-}
-
-impl serde::ser::SerializeSeq for SerializeValueArray<'_> {
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
-    where
-        T: serde::ser::Serialize + ?Sized,
-    {
-        self.inner.serialize_element(value).map_err(Error::wrap)
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        write_value(self.dst, self.inner.end())
-    }
-}
-
-impl serde::ser::SerializeTuple for SerializeValueArray<'_> {
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
-    where
-        T: serde::ser::Serialize + ?Sized,
-    {
-        self.inner.serialize_element(value).map_err(Error::wrap)
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        write_value(self.dst, self.inner.end())
-    }
-}
-
-impl serde::ser::SerializeTupleVariant for SerializeValueArray<'_> {
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
-    where
-        T: serde::ser::Serialize + ?Sized,
-    {
-        self.inner.serialize_field(value).map_err(Error::wrap)
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        write_value(self.dst, self.inner.end())
-    }
-}
-
-impl serde::ser::SerializeTupleStruct for SerializeValueArray<'_> {
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
-    where
-        T: serde::ser::Serialize + ?Sized,
-    {
-        self.inner.serialize_field(value).map_err(Error::wrap)
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        write_value(self.dst, self.inner.end())
-    }
-}

crates/toml/src/ser/map.rs

@@ -1,6 +1,5 @@
 use super::write_document;
-use super::write_value;
-use super::{Error, Serializer, ValueSerializer};
+use super::{Error, Serializer};
 use crate::fmt::DocumentFormatter;
 
 type InnerSerializeDocumentTable =
@@ -61,60 +60,3 @@ impl serde::ser::SerializeStruct for SerializeDocumentTable<'_> {
         write_document(self.dst, self.settings, self.inner.end())
     }
 }
-
-type InnerSerializeValueTable =
-    <toml_edit::ser::ValueSerializer as serde::Serializer>::SerializeMap;
-
-#[doc(hidden)]
-pub struct SerializeValueTable<'d> {
-    inner: InnerSerializeValueTable,
-    dst: &'d mut String,
-}
-
-impl<'d> SerializeValueTable<'d> {
-    pub(crate) fn new(ser: ValueSerializer<'d>, inner: InnerSerializeValueTable) -> Self {
-        Self {
-            inner,
-            dst: ser.dst,
-        }
-    }
-}
-
-impl serde::ser::SerializeMap for SerializeValueTable<'_> {
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_key<T>(&mut self, input: &T) -> Result<(), Self::Error>
-    where
-        T: serde::ser::Serialize + ?Sized,
-    {
-        self.inner.serialize_key(input).map_err(Error::wrap)
-    }
-
-    fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
-    where
-        T: serde::ser::Serialize + ?Sized,
-    {
-        self.inner.serialize_value(value).map_err(Error::wrap)
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        write_value(self.dst, self.inner.end())
-    }
-}
-
-impl serde::ser::SerializeStruct for SerializeValueTable<'_> {
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
-    where
-        T: serde::ser::Serialize + ?Sized,
-    {
-        self.inner.serialize_field(key, value).map_err(Error::wrap)
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        write_value(self.dst, self.inner.end())
-    }
-}