summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-03-25 16:38:24 +0000
committerAlyssa Ross <hi@alyssa.is>2020-06-15 09:37:17 +0000
commite682f11cd0d063fe9111b13ab8ecff676592acdb (patch)
treee622f8bb200d8995ce25253985d1f9694546d9c0
parent616c8e59099101ec20eaf8633be929164a68dee4 (diff)
downloadcrosvm-e682f11cd0d063fe9111b13ab8ecff676592acdb.tar
crosvm-e682f11cd0d063fe9111b13ab8ecff676592acdb.tar.gz
crosvm-e682f11cd0d063fe9111b13ab8ecff676592acdb.tar.bz2
crosvm-e682f11cd0d063fe9111b13ab8ecff676592acdb.tar.lz
crosvm-e682f11cd0d063fe9111b13ab8ecff676592acdb.tar.xz
crosvm-e682f11cd0d063fe9111b13ab8ecff676592acdb.tar.zst
crosvm-e682f11cd0d063fe9111b13ab8ecff676592acdb.zip
fix doc
-rw-r--r--msg_socket2/src/de.rs6
-rw-r--r--msg_socket2/src/ser.rs12
2 files changed, 9 insertions, 9 deletions
diff --git a/msg_socket2/src/de.rs b/msg_socket2/src/de.rs
index 0dec746..fa6582a 100644
--- a/msg_socket2/src/de.rs
+++ b/msg_socket2/src/de.rs
@@ -97,8 +97,8 @@ pub trait DeserializerWithFds<'de> {
     /// `VisitorWithFds` instead of a `Visitor`.
     fn deserialize_seq<V: VisitorWithFds<'de>>(self, visitor: V) -> Result<V::Value, Self::Error>;
 
-    /// Like `Deserializer::deserialize_map` but `visitor` is a
-    /// `VisitorWithFds` instead of a `Visitor`.
+    /// Like `Deserializer::deserialize_tuple_struct`, but `visitor`
+    /// is a `VisitorWithFds` instead of a `Visitor`.
     fn deserialize_tuple_struct<V: VisitorWithFds<'de>>(
         self,
         name: &'static str,
@@ -208,7 +208,7 @@ where
         name: &'static str,
         len: usize,
         visitor: V,
-    ) -> Result<V::Value, D::Error> {
+    ) -> Result<V::Value, Self::Error> {
         let wrapper = WithFds {
             inner: visitor,
             fds: self.fds,
diff --git a/msg_socket2/src/ser.rs b/msg_socket2/src/ser.rs
index 07ead80..ed85621 100644
--- a/msg_socket2/src/ser.rs
+++ b/msg_socket2/src/ser.rs
@@ -41,7 +41,7 @@ pub(crate) struct Composite<'ser, S> {
     serializer: &'ser mut S,
 }
 
-/// Like `SerializeSeq`, but accepts file descriptors as well as data.
+/// Like `SerializeSeq`, but accepts file descriptors instead of data.
 pub trait SerializeSeqFds {
     /// Like `SerializeSeq::Ok`.
     type Ok;
@@ -76,7 +76,7 @@ impl<'ser, 'fds> SerializeSeqFds for Composite<'ser, FdSerializerImpl<'fds>> {
     }
 }
 
-/// Like `SerializeTupleStruct`, but accepts file descriptors as well as data.
+/// Like `SerializeTupleStruct`, but accepts file descriptors instead of data.
 pub trait SerializeTupleStructFds {
     /// Like `SerializeTupleStruct::Ok`.
     type Ok;
@@ -147,7 +147,7 @@ impl<'ser, 'fds> SerializeTupleVariantFds for Composite<'ser, FdSerializerImpl<'
     }
 }
 
-/// Like `SerializeMap`, but provides file descriptors as well as data.
+/// Like `SerializeMap`, but provides file descriptors instead of data.
 pub trait SerializeMapFds {
     /// Like `SerializeMap::Ok`.
     type Ok;
@@ -200,7 +200,7 @@ impl<'ser, 'fds> SerializeMapFds for Composite<'ser, FdSerializerImpl<'fds>> {
     }
 }
 
-/// Like `SerializeStruct`, but provides file descriptors as well as
+/// Like `SerializeStruct`, but provides file descriptors instead of
 /// data.
 pub trait SerializeStructFds {
     /// Like `SerializeStruct::Ok`.
@@ -242,8 +242,8 @@ impl<'ser, 'fds> SerializeStructFds for Composite<'ser, FdSerializerImpl<'fds>>
     }
 }
 
-/// Like `SerializeStructVariant`, but provides file descriptors as
-/// well as data.
+/// Like `SerializeStructVariant`, but provides file descriptors
+/// instead of data.
 pub trait SerializeStructVariantFds {
     /// Like `SerializeStructVariant::Ok`.
     type Ok;