Move platform specific flags and debug impl to sys modules.

Author: de-vri-es

src/lib.rs

@@ -247,29 +247,6 @@ pub struct RecvFlags(c_int);
 
 #[cfg(not(target_os = "redox"))]
 impl RecvFlags {
-    /// Check if the message terminates a record.
-    ///
-    /// Not all socket types support the notion of records.
-    /// For socket types that do support it (such as [`SEQPACKET`][Type::SEQPACKET]),
-    /// a record is terminated by sending a message with the end-of-record flag set.
-    ///
-    /// On Unix this corresponds to the MSG_EOR flag.
-    #[cfg(unix)]
-    pub fn is_end_of_record(self) -> bool {
-        self.0 & sys::MSG_EOR != 0
-    }
-
-    /// Check if the message contains out-of-band data.
-    ///
-    /// This is useful for protocols where you receive out-of-band data
-    /// mixed in with the normal data stream.
-    ///
-    /// On Unix this corresponds to the MSG_OOB flag.
-    #[cfg(unix)]
-    pub fn is_out_of_band(self) -> bool {
-        self.0 & sys::MSG_OOB != 0
-    }
-
     /// Check if the message contains a truncated datagram.
     ///
     /// This flag is only used for datagram-based sockets,
@@ -281,16 +258,3 @@ impl RecvFlags {
         self.0 & sys::MSG_TRUNC != 0
     }
 }
-
-#[cfg(not(target_os = "redox"))]
-impl std::fmt::Debug for RecvFlags {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mut dbg = f.debug_struct("RecvFlags");
-        #[cfg(unix)]
-        dbg.field("is_end_of_record", &self.is_end_of_record());
-        #[cfg(unix)]
-        dbg.field("is_out_of_band", &self.is_out_of_band());
-        dbg.field("is_truncated", &self.is_truncated());
-        dbg.finish()
-    }
-}

src/sys/unix.rs

@@ -85,7 +85,7 @@ macro_rules! syscall {
 
 // Re-export message flags for the RecvFlags struct.
 #[cfg(not(target_os = "redox"))]
-pub(crate) use libc::{MSG_EOR, MSG_OOB, MSG_TRUNC};
+pub(crate) use libc::MSG_TRUNC;
 
 #[cfg(any(target_os = "android", all(target_os = "linux", target_env = "gnu")))]
 type IovLen = usize;
@@ -211,6 +211,41 @@ impl_debug!(
     libc::IPPROTO_UDP,
 );
 
+/// Unix-only API.
+impl RecvFlags {
+    /// Check if the message terminates a record.
+    ///
+    /// Not all socket types support the notion of records.
+    /// For socket types that do support it (such as [`SEQPACKET`][Type::SEQPACKET]),
+    /// a record is terminated by sending a message with the end-of-record flag set.
+    ///
+    /// On Unix this corresponds to the MSG_EOR flag.
+    pub fn is_end_of_record(self) -> bool {
+        self.0 & libc::MSG_EOR != 0
+    }
+
+    /// Check if the message contains out-of-band data.
+    ///
+    /// This is useful for protocols where you receive out-of-band data
+    /// mixed in with the normal data stream.
+    ///
+    /// On Unix this corresponds to the MSG_OOB flag.
+    pub fn is_out_of_band(self) -> bool {
+        self.0 & libc::MSG_OOB != 0
+    }
+}
+
+#[cfg(not(target_os = "redox"))]
+impl std::fmt::Debug for RecvFlags {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("RecvFlags")
+            .field("is_end_of_record", &self.is_end_of_record())
+            .field("is_out_of_band", &self.is_out_of_band())
+            .field("is_truncated", &self.is_truncated())
+            .finish()
+    }
+}
+
 /// Unix only API.
 impl SockAddr {
     /// Constructs a `SockAddr` with the family `AF_UNIX` and the provided path.

src/sys/windows.rs

@@ -44,8 +44,9 @@ pub use winapi::ctypes::c_int;
 
 /// Fake MSG_TRUNC flag for the [`RecvFlags`] struct.
 ///
-/// Value copied from Linux.
-pub(crate) const MSG_TRUNC: c_int = 0x20;
+/// The flag is enabled when a `WSARecv[From]` call returns `WSAEMSGSIZE`.
+/// The value of the flag is defined by us.
+pub(crate) const MSG_TRUNC: c_int = 0x01;
 
 // Used in `Domain`.
 pub(crate) use winapi::shared::ws2def::{AF_INET, AF_INET6};
@@ -103,6 +104,14 @@ impl_debug!(
     self::IPPROTO_UDP,
 );
 
+impl std::fmt::Debug for RecvFlags {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("RecvFlags")
+            .field("is_truncated", &self.is_truncated())
+            .finish()
+    }
+}
+
 #[repr(C)]
 struct tcp_keepalive {
     onoff: c_ulong,