summary refs log tree commit diff
path: root/msg_socket2/tests
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-03-26 09:03:39 +0000
committerAlyssa Ross <hi@alyssa.is>2020-06-15 09:37:19 +0000
commit353b1d9091b9095282463f36e26643506e2d2897 (patch)
tree714c613f9140cfebd45a3308ff2f035b0bb10958 /msg_socket2/tests
parente682f11cd0d063fe9111b13ab8ecff676592acdb (diff)
downloadcrosvm-353b1d9091b9095282463f36e26643506e2d2897.tar
crosvm-353b1d9091b9095282463f36e26643506e2d2897.tar.gz
crosvm-353b1d9091b9095282463f36e26643506e2d2897.tar.bz2
crosvm-353b1d9091b9095282463f36e26643506e2d2897.tar.lz
crosvm-353b1d9091b9095282463f36e26643506e2d2897.tar.xz
crosvm-353b1d9091b9095282463f36e26643506e2d2897.tar.zst
crosvm-353b1d9091b9095282463f36e26643506e2d2897.zip
use lifetimes in serialization to prevent closing
Diffstat (limited to 'msg_socket2/tests')
-rw-r--r--msg_socket2/tests/round_trip.rs12
1 files changed, 9 insertions, 3 deletions
diff --git a/msg_socket2/tests/round_trip.rs b/msg_socket2/tests/round_trip.rs
index a89f414..8bdd1e4 100644
--- a/msg_socket2/tests/round_trip.rs
+++ b/msg_socket2/tests/round_trip.rs
@@ -15,13 +15,16 @@ use sys_util::net::UnixSeqpacket;
 struct Inner(File, u16);
 
 impl SerializeWithFds for Inner {
-    fn serialize<Ser: Serializer>(&self, serializer: Ser) -> Result<Ser::Ok, Ser::Error> {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         let mut state = serializer.serialize_tuple_struct("Inner", 1)?;
         state.serialize_field(&self.1)?;
         state.end()
     }
 
-    fn serialize_fds<Ser: FdSerializer>(&self, serializer: Ser) -> Result<Ser::Ok, Ser::Error> {
+    fn serialize_fds<'fds, S: FdSerializer<'fds>>(
+        &'fds self,
+        serializer: S,
+    ) -> Result<S::Ok, S::Error> {
         let mut state = serializer.serialize_tuple_struct("Inner", 1)?;
         state.serialize_field(&self.0)?;
         state.end()
@@ -71,7 +74,10 @@ impl SerializeWithFds for Test {
         state.end()
     }
 
-    fn serialize_fds<Ser: FdSerializer>(&self, serializer: Ser) -> Result<Ser::Ok, Ser::Error> {
+    fn serialize_fds<'fds, S: FdSerializer<'fds>>(
+        &'fds self,
+        serializer: S,
+    ) -> Result<S::Ok, S::Error> {
         let mut state = serializer.serialize_struct("Test", 2)?;
         state.serialize_field("fd", &self.fd)?;
         state.serialize_field("inner", &self.inner)?;