Merge remote-tracking branch 'origin/master'

2 files changed, 3 insertions, 27 deletions

diff --git a/msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs b/msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
index c814767..bfca732 100644
--- a/msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
+++ b/msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
@@ -96,7 +96,7 @@ fn get_struct_fields(ds: DataStruct) -> Vec<StructField> {
                 Meta::List(meta) => {
                     for nested in meta.nested {
                         match nested {
-                            NestedMeta::Meta(Meta::Path(meta_path))
+                            NestedMeta::Meta(Meta::Path(ref meta_path))
                                 if meta_path.is_ident("skip") =>
                             {
                                 skipped = true;
diff --git a/msg_socket/src/msg_on_socket.rs b/msg_socket/src/msg_on_socket.rs
index d263407..82ee9a8 100644
--- a/msg_socket/src/msg_on_socket.rs
+++ b/msg_socket/src/msg_on_socket.rs
@@ -146,30 +146,6 @@ impl MsgOnSocket for SysError {
     }
 }
 
-impl MsgOnSocket for RawFd {
-    fn fixed_size() -> Option<usize> {
-        Some(0)
-    }
-
-    fn fd_count(&self) -> usize {
-        1
-    }
-
-    unsafe fn read_from_buffer(_buffer: &[u8], fds: &[RawFd]) -> MsgResult<(Self, usize)> {
-        if fds.is_empty() {
-            return Err(MsgError::ExpectFd);
-        }
-        Ok((fds[0], 1))
-    }
-    fn write_to_buffer(&self, _buffer: &mut [u8], fds: &mut [RawFd]) -> MsgResult<usize> {
-        if fds.is_empty() {
-            return Err(MsgError::WrongFdBufferSize);
-        }
-        fds[0] = *self;
-        Ok(1)
-    }
-}
-
 impl<T: MsgOnSocket> MsgOnSocket for Option<T> {
     fn uses_fd() -> bool {
         T::uses_fd()
@@ -178,7 +154,7 @@ impl<T: MsgOnSocket> MsgOnSocket for Option<T> {
     fn msg_size(&self) -> usize {
         match self {
             Some(v) => v.msg_size() + 1,
-            None => 0,
+            None => 1,
         }
     }
 
@@ -291,7 +267,7 @@ macro_rules! rawfd_impl {
                 Ok(($type::from_raw_fd(fds[0]), 1))
             }
             fn write_to_buffer(&self, _buffer: &mut [u8], fds: &mut [RawFd]) -> MsgResult<usize> {
-                if fds.len() < 1 {
+                if fds.is_empty() {
                     return Err(MsgError::WrongFdBufferSize);
                 }
                 fds[0] = self.as_raw_fd();