SerializerWithFds trait

1 files changed, 8 insertions, 9 deletions

diff --git a/msg_socket2/tests/round_trip.rs b/msg_socket2/tests/round_trip.rs
index 1c6b5a3..efec94b 100644
--- a/msg_socket2/tests/round_trip.rs
+++ b/msg_socket2/tests/round_trip.rs
@@ -18,13 +18,12 @@ struct Test {
 }
 
 impl SerializeWithFds for Test {
-    fn serialize<Ser>(&self, serializer: SerializerWithFds<Ser>) -> Result<Ser::Ok, Ser::Error>
-    where
-        Ser: Serializer,
-    {
-        let mut state = serializer.serializer.serialize_struct("Test", 1)?;
-        serializer.fds.push(self.fd);
-        state.skip_field("fd")?;
+    fn serialize<Ser: SerializerWithFds>(
+        &self,
+        mut serializer: Ser,
+    ) -> Result<<Ser::Ser as Serializer>::Ok, <Ser::Ser as Serializer>::Error> {
+        serializer.fds().push(self.fd);
+        serializer.fds().push(self.inner.0);
 
         struct SerializableInner<'a>(&'a Inner);
 
@@ -36,9 +35,9 @@ impl SerializeWithFds for Test {
             }
         }
 
-        serializer.fds.push(self.inner.0);
+        let mut state = serializer.serializer().serialize_struct("Test", 1)?;
+        state.skip_field("fd")?;
         state.serialize_field("inner", &SerializableInner(&self.inner))?;
-
         state.end()
     }
 }