Merge #2027 #2057

2027: Update to bitflags 2.2.1. r=asomers a=qwandor

This is a new major version and requires some code changes.

2057: Haiku: `speed_t` is defined as `u8` for 32 and 64 bit systems r=asomers a=nielx

This fixes the build on 32 bit Haiku systems.

Co-authored-by: Andrew Walbran <[email protected]>
Co-authored-by: Niels Sascha Reedijk <[email protected]>

Author: 3 people

Cargo.toml

@@ -28,7 +28,7 @@ targets = [
 
 [dependencies]
 libc = { version = "0.2.141", features = ["extra_traits"] }
-bitflags = "1.1"
+bitflags = "2.3.1"
 cfg-if = "1.0"
 pin-utils = { version = "0.1.0", optional = true }
 memoffset = { version = "0.9", optional = true }

src/macros.rs

@@ -63,6 +63,8 @@ macro_rules! libc_bitflags {
         }
     ) => {
         ::bitflags::bitflags! {
+            #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+            #[repr(transparent)]
             $(#[$outer])*
             pub struct $BitFlags: $T {
                 $(

src/mount/bsd.rs

@@ -392,7 +392,7 @@ impl<'a> Nmount<'a> {
 
         let niov = self.iov.len() as c_uint;
         let iovp = self.iov.as_mut_ptr() as *mut libc::iovec;
-        let res = unsafe { libc::nmount(iovp, niov, flags.bits) };
+        let res = unsafe { libc::nmount(iovp, niov, flags.bits()) };
         match Errno::result(res) {
             Ok(_) => Ok(()),
             Err(error) => {
@@ -446,7 +446,7 @@ where
     P: ?Sized + NixPath,
 {
     let res = mountpoint.with_nix_path(|cstr| unsafe {
-        libc::unmount(cstr.as_ptr(), flags.bits)
+        libc::unmount(cstr.as_ptr(), flags.bits())
     })?;
 
     Errno::result(res).map(drop)

src/mount/linux.rs

@@ -132,7 +132,7 @@ pub fn mount<
                         s,
                         t.as_ptr(),
                         ty,
-                        flags.bits,
+                        flags.bits(),
                         d as *const libc::c_void,
                     )
                 })
@@ -156,7 +156,7 @@ pub fn umount<P: ?Sized + NixPath>(target: &P) -> Result<()> {
 /// See also [`umount`](https://man7.org/linux/man-pages/man2/umount.2.html)
 pub fn umount2<P: ?Sized + NixPath>(target: &P, flags: MntFlags) -> Result<()> {
     let res = target.with_nix_path(|cstr| unsafe {
-        libc::umount2(cstr.as_ptr(), flags.bits)
+        libc::umount2(cstr.as_ptr(), flags.bits())
     })?;
 
     Errno::result(res).map(drop)

src/mqueue.rs

@@ -139,7 +139,7 @@ impl MqAttr {
 /// Open a message queue
 ///
 /// See also [`mq_open(2)`](https://pubs.opengroup.org/onlinepubs/9699919799/functions/mq_open.html)
-// The mode.bits cast is only lossless on some OSes
+// The mode.bits() cast is only lossless on some OSes
 #[allow(clippy::cast_lossless)]
 pub fn mq_open(
     name: &CStr,

src/sys/event.rs

@@ -71,7 +71,7 @@ impl Kqueue {
                     timeout as *const timespec
                 } else {
                     ptr::null()
-                }
+                },
             )
         };
         Errno::result(res).map(|r| r as usize)

src/sys/stat.rs

@@ -177,7 +177,7 @@ pub fn mknod<P: ?Sized + NixPath>(
     dev: dev_t,
 ) -> Result<()> {
     let res = path.with_nix_path(|cstr| unsafe {
-        libc::mknod(cstr.as_ptr(), kind.bits | perm.bits() as mode_t, dev)
+        libc::mknod(cstr.as_ptr(), kind.bits() | perm.bits() as mode_t, dev)
     })?;
 
     Errno::result(res).map(drop)
@@ -202,7 +202,7 @@ pub fn mknodat<P: ?Sized + NixPath>(
         libc::mknodat(
             dirfd,
             cstr.as_ptr(),
-            kind.bits | perm.bits() as mode_t,
+            kind.bits() | perm.bits() as mode_t,
             dev,
         )
     })?;

src/sys/statvfs.rs

@@ -12,7 +12,6 @@ use crate::{errno::Errno, NixPath, Result};
 #[cfg(not(target_os = "redox"))]
 libc_bitflags!(
     /// File system mount Flags
-    #[repr(C)]
     #[derive(Default)]
     pub struct FsFlags: c_ulong {
         /// Read Only

src/sys/termios.rs

@@ -309,7 +309,7 @@ impl Termios {
         let termios = *self.inner.borrow_mut();
         self.input_flags = InputFlags::from_bits_truncate(termios.c_iflag);
         self.output_flags = OutputFlags::from_bits_truncate(termios.c_oflag);
-        self.control_flags = ControlFlags::from_bits_truncate(termios.c_cflag);
+        self.control_flags = ControlFlags::from_bits_retain(termios.c_cflag);
         self.local_flags = LocalFlags::from_bits_truncate(termios.c_lflag);
         self.control_chars = termios.c_cc;
         #[cfg(any(
@@ -355,9 +355,9 @@ libc_enum! {
     /// enum.
     ///
     /// B0 is special and will disable the port.
-    #[cfg_attr(all(any(target_os = "haiku"), target_pointer_width = "64"), repr(u8))]
+    #[cfg_attr(target_os = "haiku", repr(u8))]
     #[cfg_attr(all(any(target_os = "ios", target_os = "macos"), target_pointer_width = "64"), repr(u64))]
-    #[cfg_attr(not(all(any(target_os = "ios", target_os = "macos", target_os = "haiku"), target_pointer_width = "64")), repr(u32))]
+    #[cfg_attr(all(not(all(any(target_os = "ios", target_os = "macos"), target_pointer_width = "64")), not(target_os = "haiku")), repr(u32))]
     #[non_exhaustive]
     pub enum BaudRate {
         B0,

src/sys/time.rs

@@ -91,6 +91,7 @@ pub(crate) mod timer {
     #[cfg(any(target_os = "android", target_os = "linux"))]
     bitflags! {
         /// Flags that are used for arming the timer.
+        #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
         pub struct TimerSetTimeFlags: libc::c_int {
             const TFD_TIMER_ABSTIME = libc::TFD_TIMER_ABSTIME;
             const TFD_TIMER_CANCEL_ON_SET = libc::TFD_TIMER_CANCEL_ON_SET;
@@ -104,6 +105,7 @@ pub(crate) mod timer {
     ))]
     bitflags! {
         /// Flags that are used for arming the timer.
+        #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
         pub struct TimerSetTimeFlags: libc::c_int {
             const TFD_TIMER_ABSTIME = libc::TIMER_ABSTIME;
         }

src/unistd.rs

@@ -3375,7 +3375,7 @@ feature! {
 /// See [access(2)](https://pubs.opengroup.org/onlinepubs/9699919799/functions/access.html)
 pub fn access<P: ?Sized + NixPath>(path: &P, amode: AccessFlags) -> Result<()> {
     let res = path.with_nix_path(|cstr| unsafe {
-        libc::access(cstr.as_ptr(), amode.bits)
+        libc::access(cstr.as_ptr(), amode.bits())
     })?;
     Errno::result(res).map(drop)
 }
@@ -3422,7 +3422,7 @@ pub fn faccessat<P: ?Sized + NixPath>(
 ))]
 pub fn eaccess<P: ?Sized + NixPath>(path: &P, mode: AccessFlags) -> Result<()> {
     let res = path.with_nix_path(|cstr| unsafe {
-        libc::eaccess(cstr.as_ptr(), mode.bits)
+        libc::eaccess(cstr.as_ptr(), mode.bits())
     })?;
     Errno::result(res).map(drop)
 }