refactor: enable most macOS funcs for apple_targets (#2241)

* refactor: enable most macOS funcs for apple_targets * respond to review * respond to review
nix-rust · Dec 2, 2023 · e95162f · e95162f
1 parent 83dfd90
commit e95162f
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 76 deletions.
diff --git a/changelog/2241.added.md b/changelog/2241.added.md
@@ -0,0 +1 @@
+`ClockId::set_time()` and `time::clock_settime()` are now enabled on macOS
diff --git a/src/mount/bsd.rs b/src/mount/bsd.rs
@@ -30,7 +30,7 @@ libc_bitflags!(
         #[cfg(target_os = "freebsd")]
         MNT_GJOURNAL;
         /// MAC support for objects.
-        #[cfg(any(target_os = "macos", target_os = "freebsd"))]
+        #[cfg(any(apple_targets, target_os = "freebsd"))]
         MNT_MULTILABEL;
         /// Disable read clustering.
         #[cfg(freebsdlike)]
@@ -58,7 +58,7 @@ libc_bitflags!(
         /// Create a snapshot of the file system.
         ///
         /// See [mksnap_ffs(8)](https://www.freebsd.org/cgi/man.cgi?query=mksnap_ffs)
-        #[cfg(any(target_os = "macos", target_os = "freebsd"))]
+        #[cfg(any(apple_targets, target_os = "freebsd"))]
         MNT_SNAPSHOT;
         /// Using soft updates.
         #[cfg(any(freebsdlike, netbsdlike))]
@@ -71,7 +71,7 @@ libc_bitflags!(
         MNT_SYNCHRONOUS;
         /// Union with underlying fs.
         #[cfg(any(
-                target_os = "macos",
+                apple_targets,
                 target_os = "freebsd",
                 target_os = "netbsd"
         ))]

diff --git a/src/mount/mod.rs b/src/mount/mod.rs
@@ -5,8 +5,8 @@ mod linux;
 #[cfg(linux_android)]
 pub use self::linux::*;
 
-#[cfg(any(freebsdlike, netbsdlike, target_os = "macos"))]
+#[cfg(bsd)]
 mod bsd;
 
-#[cfg(any(freebsdlike, netbsdlike, target_os = "macos"))]
+#[cfg(bsd)]
 pub use self::bsd::*;
diff --git a/src/net/if_.rs b/src/net/if_.rs
@@ -82,7 +82,7 @@ libc_bitflags!(
         #[cfg(any(linux_android, target_os = "fuchsia"))]
         IFF_SLAVE;
         /// Can't hear own transmissions.
-        #[cfg(any(freebsdlike, netbsdlike, target_os = "macos"))]
+        #[cfg(bsd)]
         IFF_SIMPLEX;
         /// Supports multicast. (see
         /// [`netdevice(7)`](https://man7.org/linux/man-pages/man7/netdevice.7.html))

diff --git a/src/sys/event.rs b/src/sys/event.rs
@@ -191,7 +191,7 @@ libc_bitflags! {
         EV_NODATA;
         #[allow(missing_docs)]
         EV_ONESHOT;
-        #[cfg(any(target_os = "macos", target_os = "tvos"))]
+        #[cfg(apple_targets)]
         #[allow(missing_docs)]
         EV_OOBAND;
         #[cfg(apple_targets)]

diff --git a/src/sys/mod.rs b/src/sys/mod.rs
@@ -66,7 +66,7 @@ feature! {
     pub mod pthread;
 }
 
-#[cfg(any(linux_android, freebsdlike, target_os = "macos", netbsdlike))]
+#[cfg(any(linux_android, bsd))]
 feature! {
     #![feature = "ptrace"]
     #[allow(missing_docs)]

diff --git a/src/sys/ptrace/bsd.rs b/src/sys/ptrace/bsd.rs
@@ -9,7 +9,7 @@ use std::ptr;
 pub type RequestType = c_int;
 
 cfg_if! {
-    if #[cfg(any(freebsdlike, target_os = "macos", target_os = "openbsd"))] {
+    if #[cfg(any(freebsdlike, apple_targets, target_os = "openbsd"))] {
         #[doc(hidden)]
         pub type AddressType = *mut ::libc::c_char;
     } else {
@@ -26,26 +26,26 @@ libc_enum! {
         PT_TRACE_ME,
         PT_READ_I,
         PT_READ_D,
-        #[cfg(target_os = "macos")]
+        #[cfg(apple_targets)]
         PT_READ_U,
         PT_WRITE_I,
         PT_WRITE_D,
-        #[cfg(target_os = "macos")]
+        #[cfg(apple_targets)]
         PT_WRITE_U,
         PT_CONTINUE,
         PT_KILL,
-        #[cfg(any(any(freebsdlike, target_os = "macos"),
+        #[cfg(any(any(freebsdlike, apple_targets),
                   all(target_os = "openbsd", target_arch = "x86_64"),
                   all(target_os = "netbsd", any(target_arch = "x86_64",
                                                 target_arch = "powerpc"))))]
         PT_STEP,
         PT_ATTACH,
         PT_DETACH,
-        #[cfg(target_os = "macos")]
+        #[cfg(apple_targets)]
         PT_SIGEXC,
-        #[cfg(target_os = "macos")]
+        #[cfg(apple_targets)]
         PT_THUPDATE,
-        #[cfg(target_os = "macos")]
+        #[cfg(apple_targets)]
         PT_ATTACHEXC
     }
 }
@@ -149,7 +149,7 @@ pub fn kill(pid: Pid) -> Result<()> {
 /// }
 /// ```
 #[cfg(any(
-    any(freebsdlike, target_os = "macos"),
+    any(freebsdlike, apple_targets),
     all(target_os = "openbsd", target_arch = "x86_64"),
     all(
         target_os = "netbsd",

diff --git a/src/sys/ptrace/mod.rs b/src/sys/ptrace/mod.rs
@@ -6,8 +6,8 @@ mod linux;
 #[cfg(linux_android)]
 pub use self::linux::*;
 
-#[cfg(any(freebsdlike, netbsdlike, target_os = "macos"))]
+#[cfg(bsd)]
 mod bsd;
 
-#[cfg(any(freebsdlike, netbsdlike, target_os = "macos"))]
+#[cfg(bsd)]
 pub use self::bsd::*;
diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs
@@ -8,7 +8,7 @@
 ))]
 #[cfg(feature = "net")]
 pub use self::datalink::LinkAddr;
-#[cfg(any(linux_android, target_os = "macos"))]
+#[cfg(any(linux_android, apple_targets))]
 pub use self::vsock::VsockAddr;
 use super::sa_family_t;
 use crate::errno::Errno;
@@ -197,7 +197,7 @@ pub enum AddressFamily {
     #[cfg(target_os = "linux")]
     Nfc = libc::AF_NFC,
     /// VMWare VSockets protocol for hypervisor-guest interaction.
-    #[cfg(any(linux_android, target_os = "macos"))]
+    #[cfg(any(linux_android, apple_targets))]
     Vsock = libc::AF_VSOCK,
     /// ARPANet IMP addresses
     #[cfg(bsd)]
@@ -259,15 +259,15 @@ impl AddressFamily {
             libc::AF_INET6 => Some(AddressFamily::Inet6),
             #[cfg(linux_android)]
             libc::AF_NETLINK => Some(AddressFamily::Netlink),
-            #[cfg(target_os = "macos")]
+            #[cfg(apple_targets)]
             libc::AF_SYSTEM => Some(AddressFamily::System),
             #[cfg(not(any(linux_android, target_os = "redox")))]
             libc::PF_ROUTE => Some(AddressFamily::Route),
             #[cfg(linux_android)]
             libc::AF_PACKET => Some(AddressFamily::Packet),
             #[cfg(any(bsd, target_os = "illumos"))]
             libc::AF_LINK => Some(AddressFamily::Link),
-            #[cfg(any(linux_android, target_os = "macos"))]
+            #[cfg(any(linux_android, apple_targets))]
             libc::AF_VSOCK => Some(AddressFamily::Vsock),
             _ => None,
         }
@@ -1078,7 +1078,7 @@ pub union SockaddrStorage {
     sin6: SockaddrIn6,
     ss: libc::sockaddr_storage,
     su: UnixAddr,
-    #[cfg(any(linux_android, target_os = "macos"))]
+    #[cfg(any(linux_android, apple_targets))]
     vsock: VsockAddr,
 }
 impl private::SockaddrLikePriv for SockaddrStorage {}
@@ -1154,7 +1154,7 @@ impl SockaddrLike for SockaddrStorage {
                 libc::AF_SYSTEM => unsafe {
                     SysControlAddr::from_raw(addr, l).map(|sctl| Self { sctl })
                 },
-                #[cfg(any(linux_android, target_os = "macos"))]
+                #[cfg(any(linux_android, apple_targets))]
                 libc::AF_VSOCK => unsafe {
                     VsockAddr::from_raw(addr, l).map(|vsock| Self { vsock })
                 },
@@ -1312,7 +1312,7 @@ impl SockaddrStorage {
     accessors! {as_sys_control_addr, as_sys_control_addr_mut, SysControlAddr,
     AddressFamily::System, libc::sockaddr_ctl, sctl}
 
-    #[cfg(any(linux_android, target_os = "macos"))]
+    #[cfg(any(linux_android, apple_targets))]
     accessors! {as_vsock_addr, as_vsock_addr_mut, VsockAddr,
     AddressFamily::Vsock, libc::sockaddr_vm, vsock}
 }
@@ -1349,7 +1349,7 @@ impl fmt::Display for SockaddrStorage {
                 #[cfg(feature = "ioctl")]
                 libc::AF_SYSTEM => self.sctl.fmt(f),
                 libc::AF_UNIX => self.su.fmt(f),
-                #[cfg(any(linux_android, target_os = "macos"))]
+                #[cfg(any(linux_android, apple_targets))]
                 libc::AF_VSOCK => self.vsock.fmt(f),
                 _ => "<Address family unspecified>".fmt(f),
             }
@@ -1411,7 +1411,7 @@ impl Hash for SockaddrStorage {
                 #[cfg(feature = "ioctl")]
                 libc::AF_SYSTEM => self.sctl.hash(s),
                 libc::AF_UNIX => self.su.hash(s),
-                #[cfg(any(linux_android, target_os = "macos"))]
+                #[cfg(any(linux_android, apple_targets))]
                 libc::AF_VSOCK => self.vsock.hash(s),
                 _ => self.ss.hash(s),
             }
@@ -1441,7 +1441,7 @@ impl PartialEq for SockaddrStorage {
                 #[cfg(feature = "ioctl")]
                 (libc::AF_SYSTEM, libc::AF_SYSTEM) => self.sctl == other.sctl,
                 (libc::AF_UNIX, libc::AF_UNIX) => self.su == other.su,
-                #[cfg(any(linux_android, target_os = "macos"))]
+                #[cfg(any(linux_android, apple_targets))]
                 (libc::AF_VSOCK, libc::AF_VSOCK) => self.vsock == other.vsock,
                 _ => false,
             }
@@ -1972,7 +1972,7 @@ mod datalink {
     }
 }
 
-#[cfg(any(linux_android, target_os = "macos"))]
+#[cfg(any(linux_android, apple_targets))]
 pub mod vsock {
     use super::*;
     use crate::sys::socket::addr::AddressFamily;
@@ -2023,7 +2023,7 @@ pub mod vsock {
             (inner.svm_family, inner.svm_cid, inner.svm_port)
                 == (other.svm_family, other.svm_cid, other.svm_port)
         }
-        #[cfg(target_os = "macos")]
+        #[cfg(apple_targets)]
         fn eq(&self, other: &Self) -> bool {
             let (inner, other) = (self.0, other.0);
             (
@@ -2048,7 +2048,7 @@ pub mod vsock {
             let inner = self.0;
             (inner.svm_family, inner.svm_cid, inner.svm_port).hash(s);
         }
-        #[cfg(target_os = "macos")]
+        #[cfg(apple_targets)]
         fn hash<H: Hasher>(&self, s: &mut H) {
             let inner = self.0;
             (
@@ -2073,7 +2073,7 @@ pub mod vsock {
             addr.svm_cid = cid;
             addr.svm_port = port;
 
-            #[cfg(target_os = "macos")]
+            #[cfg(apple_targets)]
             {
                 addr.svm_len = std::mem::size_of::<sockaddr_vm>() as u8;
             }

diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs
@@ -52,7 +52,7 @@ pub use crate::sys::socket::addr::netlink::NetlinkAddr;
 #[cfg(apple_targets)]
 #[cfg(feature = "ioctl")]
 pub use crate::sys::socket::addr::sys_control::SysControlAddr;
-#[cfg(any(linux_android, target_os = "macos"))]
+#[cfg(any(linux_android, apple_targets))]
 pub use crate::sys::socket::addr::vsock::VsockAddr;
 
 #[cfg(all(feature = "uio", not(target_os = "redox")))]

diff --git a/src/sys/statfs.rs b/src/sys/statfs.rs
@@ -9,10 +9,7 @@ use std::os::unix::io::{AsFd, AsRawFd};
 
 use cfg_if::cfg_if;
 
-#[cfg(all(
-    feature = "mount",
-    any(freebsdlike, target_os = "macos", netbsdlike)
-))]
+#[cfg(all(feature = "mount", bsd))]
 use crate::mount::MntFlags;
 #[cfg(target_os = "linux")]
 use crate::sys::statvfs::FsFlags;
@@ -422,10 +419,7 @@ impl Statfs {
     }
 
     /// Get the mount flags
-    #[cfg(all(
-        feature = "mount",
-        any(freebsdlike, target_os = "macos", netbsdlike)
-    ))]
+    #[cfg(all(feature = "mount", bsd))]
     #[allow(clippy::unnecessary_cast)] // Not unnecessary on all arches
     pub fn flags(&self) -> MntFlags {
         MntFlags::from_bits_truncate(self.0.f_flags as i32)
@@ -624,10 +618,7 @@ impl Debug for Statfs {
         ds.field("files", &self.files());
         ds.field("files_free", &self.files_free());
         ds.field("filesystem_id", &self.filesystem_id());
-        #[cfg(all(
-            feature = "mount",
-            any(freebsdlike, target_os = "macos", netbsdlike)
-        ))]
+        #[cfg(all(feature = "mount", bsd))]
         ds.field("flags", &self.flags());
         ds.finish()
     }

diff --git a/src/sys/termios.rs b/src/sys/termios.rs
@@ -277,18 +277,18 @@ libc_enum! {
         B1800,
         B2400,
         B4800,
-        #[cfg(any(freebsdlike, target_os = "macos", netbsdlike))]
+        #[cfg(bsd)]
         B7200,
         B9600,
-        #[cfg(any(freebsdlike, target_os = "macos", netbsdlike))]
+        #[cfg(bsd)]
         B14400,
         B19200,
-        #[cfg(any(freebsdlike, target_os = "macos", netbsdlike))]
+        #[cfg(bsd)]
         B28800,
         B38400,
         #[cfg(not(target_os = "aix"))]
         B57600,
-        #[cfg(any(freebsdlike, target_os = "macos", netbsdlike))]
+        #[cfg(bsd)]
         B76800,
         #[cfg(not(target_os = "aix"))]
         B115200,
@@ -405,10 +405,8 @@ libc_enum! {
     pub enum SpecialCharacterIndices {
         #[cfg(not(any(target_os = "aix", target_os = "haiku")))]
         VDISCARD,
-        #[cfg(any(freebsdlike,
+        #[cfg(any(bsd,
                 solarish,
-                target_os = "macos",
-                netbsdlike,
                 target_os = "aix"))]
         VDSUSP,
         VEOF,
@@ -428,10 +426,7 @@ libc_enum! {
         #[cfg(not(target_os = "haiku"))]
         VREPRINT,
         VSTART,
-        #[cfg(any(freebsdlike,
-                solarish,
-                target_os = "macos",
-                netbsdlike))]
+        #[cfg(any(bsd, solarish))]
         VSTATUS,
         VSTOP,
         VSUSP,
@@ -461,13 +456,7 @@ impl SpecialCharacterIndices {
 }
 
 pub use libc::NCCS;
-#[cfg(any(
-    linux_android,
-    freebsdlike,
-    target_os = "aix",
-    target_os = "macos",
-    netbsdlike
-))]
+#[cfg(any(linux_android, target_os = "aix", bsd))]
 pub use libc::_POSIX_VDISABLE;
 
 libc_bitflags! {
@@ -488,7 +477,7 @@ libc_bitflags! {
         IXANY;
         #[cfg(not(any(target_os = "redox", target_os = "haiku")))]
         IMAXBEL;
-        #[cfg(any(linux_android, target_os = "macos"))]
+        #[cfg(any(linux_android, apple_targets))]
         IUTF8;
     }
 }
@@ -579,7 +568,7 @@ libc_bitflags! {
         FF1 as tcflag_t;
         #[cfg(bsd)]
         OXTABS;
-        #[cfg(any(freebsdlike, target_os = "macos", netbsdlike))]
+        #[cfg(bsd)]
         ONOEOT as tcflag_t;
 
         // Bitmasks for use with OutputFlags to select specific settings
@@ -641,7 +630,7 @@ libc_bitflags! {
         CIBAUD;
         #[cfg(linux_android)]
         CBAUDEX;
-        #[cfg(any(freebsdlike, target_os = "macos", netbsdlike))]
+        #[cfg(bsd)]
         MDMBUF;
         #[cfg(netbsdlike)]
         CHWFLOW;