summary refs log tree commit diff
path: root/msg_socket2/tests
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-06-14 20:18:48 +0000
committerAlyssa Ross <hi@alyssa.is>2020-06-15 09:37:07 +0000
commit4d2e22e374e8ac93be227f0357efd2c0d7a9f699 (patch)
tree738ba443359adaf7311abf2fdddb750263d18587 /msg_socket2/tests
parent8214c4c64fbdbf6ae84634bb822a90959271cad5 (diff)
downloadcrosvm-4d2e22e374e8ac93be227f0357efd2c0d7a9f699.tar
crosvm-4d2e22e374e8ac93be227f0357efd2c0d7a9f699.tar.gz
crosvm-4d2e22e374e8ac93be227f0357efd2c0d7a9f699.tar.bz2
crosvm-4d2e22e374e8ac93be227f0357efd2c0d7a9f699.tar.lz
crosvm-4d2e22e374e8ac93be227f0357efd2c0d7a9f699.tar.xz
crosvm-4d2e22e374e8ac93be227f0357efd2c0d7a9f699.tar.zst
crosvm-4d2e22e374e8ac93be227f0357efd2c0d7a9f699.zip
switch from poly_msg_socket to msg_socket2
Diffstat (limited to 'msg_socket2/tests')
-rw-r--r--msg_socket2/tests/round_trip.rs8
1 files changed, 2 insertions, 6 deletions
diff --git a/msg_socket2/tests/round_trip.rs b/msg_socket2/tests/round_trip.rs
index 08e1aff..1c6b5a3 100644
--- a/msg_socket2/tests/round_trip.rs
+++ b/msg_socket2/tests/round_trip.rs
@@ -2,7 +2,6 @@ use std::os::unix::prelude::*;
 
 use std::fmt::{self, Formatter};
 use std::marker::PhantomData;
-use std::mem::size_of;
 
 use msg_socket2::*;
 use serde::de::*;
@@ -23,9 +22,7 @@ impl SerializeWithFds for Test {
     where
         Ser: Serializer,
     {
-        let mut state = serializer
-            .serializer
-            .serialize_struct("Test", size_of::<Test>())?;
+        let mut state = serializer.serializer.serialize_struct("Test", 1)?;
         serializer.fds.push(self.fd);
         state.skip_field("fd")?;
 
@@ -33,8 +30,7 @@ impl SerializeWithFds for Test {
 
         impl<'a> Serialize for SerializableInner<'a> {
             fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-                let mut state = serializer
-                    .serialize_tuple_struct("Inner", size_of::<Inner>() - size_of::<RawFd>() * 1)?;
+                let mut state = serializer.serialize_tuple_struct("Inner", 1)?;
                 state.serialize_field(&(self.0).1)?;
                 state.end()
             }