Fix MacOS CI, pt. 2: The Sequel

dgram/src/lib.rs

@@ -13,6 +13,7 @@ pub struct GsoSettings {
 mod linux_imports {
  pub(super) use crate::syscalls::recv_msg;
  pub(super) use crate::syscalls::send_msg;
+ pub(super) use crate::GsoSettings;
  pub(super) use nix::errno::Errno;
  pub(super) use nix::sys::socket::getsockopt;
  pub(super) use nix::sys::socket::recvmsg;
@@ -25,6 +26,7 @@ mod linux_imports {
  pub(super) use nix::sys::socket::sockopt::UdpGsoSegment;
  pub(super) use nix::sys::socket::AddressFamily;
  pub(super) use nix::sys::socket::ControlMessage;
+ pub(super) use nix::sys::socket::ControlMessageOwned;
  pub(super) use nix::sys::socket::MsgFlags;
  pub(super) use nix::sys::socket::SetSockOpt;
  pub(super) use nix::sys::socket::SockaddrLike;

dgram/src/socket_setup.rs

@@ -54,7 +54,7 @@ pub fn set_gso_segment(sock: &impl AsFd, segment: usize) -> io::Result<()> {
 
 #[cfg(not(target_os = "linux"))]
 pub fn set_gso_segment(_: &impl AsFd, _: usize) -> io::Result<()> {
- Err("unsupported").into_io()
+ Err("unsupported")
 }
 
 #[cfg(target_os = "linux")]
@@ -66,7 +66,7 @@ pub fn set_gro(sock: &impl AsFd) -> io::Result<()> {
 
 #[cfg(not(target_os = "linux"))]
 pub fn set_gro(_: &impl AsFd) -> io::Result<()> {
- Err("unsupported").into_io()
+ Err("unsupported")
 }
 
 #[cfg(target_os = "linux")]
@@ -77,8 +77,8 @@ fn set_udp_rxq_ovfl(sock: &impl AsFd) -> io::Result<()> {
 }
 
 #[cfg(not(target_os = "linux"))]
-fn set_udp_rxq_ovfl<S>(_: &impl AsFd) -> io::Result<()> {
- Err("unsupported").into_io()
+fn set_udp_rxq_ovfl(_: &impl AsFd) -> io::Result<()> {
+ Err("unsupported")
 }
 
 #[cfg(target_os = "linux")]
@@ -95,7 +95,7 @@ pub fn set_tx_time(sock: &impl AsFd) -> io::Result<()> {
 
 #[cfg(not(target_os = "linux"))]
 pub fn set_tx_time(_: &impl AsFd) -> io::Result<()> {
- Err("unsupported").into_io()
+ Err("unsupported")
 }
 
 #[cfg(target_os = "linux")]
@@ -107,5 +107,5 @@ pub fn set_rx_time(sock: &impl AsFd) -> io::Result<()> {
 
 #[cfg(not(target_os = "linux"))]
 pub fn set_rx_time(_: &impl AsFd) -> io::Result<()> {
- Err("unsupported").into_io()
+ Err("unsupported")
 }

dgram/src/sync.rs

@@ -1,5 +1,4 @@
 use crate::syscalls::RecvData;
-use crate::GsoSettings;
 use mio::net::UdpSocket;
 use std::io::Result;
 use std::net::SocketAddr;
@@ -80,15 +79,15 @@ pub async fn send_to(
  socket: &UdpSocket, client_addr: SocketAddr, send_buf: &[u8],
  _segment_size: usize, _num_pkts: usize, _tx_time: Option<Instant>,
 ) -> Result<usize> {
- socket.send_to(send_buf, client_addr).await
+ socket.send_to(send_buf, client_addr)
 }
 
 // Signature changes because we can't use MessageFlags outside of a *NIX context
 #[cfg(not(target_os = "linux"))]
 pub async fn recv_from(
  socket: &UdpSocket, read_buf: &mut [u8], _cmsg_space: &mut Vec<u8>,
 ) -> Result<RecvData> {
- let recv = socket.recv(read_buf).await?;
+ let recv = socket.recv(read_buf)?;
 
  Ok(RecvData {
  bytes: recv,

dgram/src/syscalls.rs

@@ -1,18 +1,20 @@
-use crate::GsoSettings;
-use nix::sys::socket::ControlMessageOwned;
 use std::net::SocketAddr;
-use std::os::fd::AsFd;
-use std::time::Instant;
 use std::time::SystemTime;
 
+mod linux {
+ pub(super) use super::super::linux_imports::*;
+ pub(super) use std::os::fd::AsFd;
+ pub(super) use std::time::Instant;
+}
+
 #[cfg(target_os = "linux")]
-use super::linux_imports::*;
+use linux::*;
 
 // An instant with the value of zero, since [`Instant`] is backed by a version
 // of timespec this allows to extract raw values from an [`Instant`]
 #[cfg(target_os = "linux")]
 const INSTANT_ZERO: Instant = unsafe { std::mem::transmute(0u128) };
-
+#[cfg(target_os = "linux")]
 pub(crate) type SyscallResult<T> = std::result::Result<T, Errno>;
 
 #[cfg(target_os = "linux")]

dgram/src/tokio.rs

@@ -1,8 +1,6 @@
 use crate::syscalls::RecvData;
-use crate::GsoSettings;
 use std::io::Result;
 use std::net::SocketAddr;
-use std::os::fd::AsFd;
 use std::time::Instant;
 
 #[cfg(target_os = "linux")]