Fix some todos. (#1298)

Use constants in libc and linux_raw_sys that are now upstream.

Rename `splice_fd_in_or_file_index_union` to
`splice_fd_in_or_file_index_or_addr_len_union`.

Author: sunfishcode

src/backend/libc/c.rs

@@ -97,10 +97,6 @@ pub(crate) const O_LARGEFILE: c_int = linux_raw_sys::general::O_LARGEFILE as _;
 #[cfg(solarish)]
 pub(crate) const O_LARGEFILE: c_int = 0x2000;
 
-// TODO: This is new in Linux 6.11; remove when linux-raw-sys is updated.
-#[cfg(linux_kernel)]
-pub(crate) const MAP_DROPPABLE: u32 = 0x8;
-
 // On PowerPC, the regular `termios` has the `termios2` fields and there is no
 // `termios2`, so we define aliases.
 #[cfg(all(
@@ -513,3 +509,7 @@ pub(crate) use statx_flags::*;
 #[cfg(feature = "fs")]
 #[cfg(target_os = "android")]
 pub(crate) use libc::__fsid_t as fsid_t;
+
+#[cfg(feature = "mm")]
+#[cfg(target_os = "android")]
+pub(crate) const MAP_DROPPABLE: c_int = bitcast!(linux_raw_sys::general::MAP_DROPPABLE);

src/backend/linux_raw/c.rs

@@ -321,12 +321,6 @@ mod reboot_symbols {
 #[cfg(feature = "system")]
 pub(crate) use reboot_symbols::*;
 
-// TODO: This is new in Linux 6.11; remove when linux-raw-sys is updated.
-pub(crate) const MAP_DROPPABLE: u32 = 0x8;
-
-// TODO: This is new in Linux 6.5; remove when linux-raw-sys is updated.
-pub(crate) const MOVE_MOUNT_BENEATH: u32 = 0x200;
-
 #[cfg(any(
     feature = "fs",
     all(

src/backend/linux_raw/mm/types.rs

@@ -1,4 +1,3 @@
-use crate::backend::c;
 use crate::ffi;
 use bitflags::bitflags;
 
@@ -107,7 +106,7 @@ bitflags! {
         #[cfg(not(any(target_arch = "mips", target_arch = "mips32r6", target_arch = "mips64", target_arch = "mips64r6")))]
         const UNINITIALIZED = linux_raw_sys::general::MAP_UNINITIALIZED;
         /// `MAP_DROPPABLE`
-        const DROPPABLE = c::MAP_DROPPABLE;
+        const DROPPABLE = linux_raw_sys::general::MAP_DROPPABLE;
 
         /// <https://docs.rs/bitflags/*/bitflags/#externally-defined-flags>
         const _ = !0;

src/backend/linux_raw/mount/types.rs

@@ -1,4 +1,3 @@
-use crate::backend::c;
 use crate::ffi;
 use bitflags::bitflags;
 
@@ -228,7 +227,7 @@ bitflags! {
         const MOVE_MOUNT_SET_GROUP = linux_raw_sys::general::MOVE_MOUNT_SET_GROUP;
 
         /// `MOVE_MOUNT_BENEATH` (since Linux 6.5)
-        const MOVE_MOUNT_BENEATH = c::MOVE_MOUNT_BENEATH;
+        const MOVE_MOUNT_BENEATH = linux_raw_sys::general::MOVE_MOUNT_BENEATH;
 
         /// `MOVE_MOUNT__MASK`
         const MOVE_MOUNT__MASK = linux_raw_sys::general::MOVE_MOUNT__MASK;

src/io_uring/mod.rs

@@ -1050,7 +1050,7 @@ pub struct io_uring_sqe {
     pub user_data: io_uring_user_data,
     pub buf: buf_union,
     pub personality: u16,
-    pub splice_fd_in_or_file_index: splice_fd_in_or_file_index_union,
+    pub splice_fd_in_or_file_index_or_addr_len: splice_fd_in_or_file_index_or_addr_len_union,
     pub addr3_or_cmd: addr3_or_cmd_union,
 }
 
@@ -1157,11 +1157,10 @@ pub union buf_union {
     pub buf_group: u16,
 }
 
-// TODO: Rename this to include `addr_len` when we have a semver bump?
 #[allow(missing_docs)]
 #[repr(C)]
 #[derive(Copy, Clone)]
-pub union splice_fd_in_or_file_index_union {
+pub union splice_fd_in_or_file_index_or_addr_len_union {
     pub splice_fd_in: i32,
     pub file_index: u32,
     pub addr_len: addr_len_struct,
@@ -1496,10 +1495,10 @@ impl Default for buf_union {
     }
 }
 
-impl Default for splice_fd_in_or_file_index_union {
+impl Default for splice_fd_in_or_file_index_or_addr_len_union {
     #[inline]
     fn default() -> Self {
-        default_union!(splice_fd_in_or_file_index_union, splice_fd_in)
+        default_union!(splice_fd_in_or_file_index_or_addr_len_union, splice_fd_in)
     }
 }
 
@@ -1527,7 +1526,10 @@ mod tests {
         check_renamed_type!(addr3_or_cmd_union, io_uring_sqe__bindgen_ty_6);
         check_renamed_type!(op_flags_union, io_uring_sqe__bindgen_ty_3);
         check_renamed_type!(buf_union, io_uring_sqe__bindgen_ty_4);
-        check_renamed_type!(splice_fd_in_or_file_index_union, io_uring_sqe__bindgen_ty_5);
+        check_renamed_type!(
+            splice_fd_in_or_file_index_or_addr_len_union,
+            io_uring_sqe__bindgen_ty_5
+        );
         check_renamed_type!(addr_len_struct, io_uring_sqe__bindgen_ty_5__bindgen_ty_1);
         check_renamed_type!(
             register_or_sqe_op_or_sqe_flags_union,
@@ -1549,7 +1551,11 @@ mod tests {
         check_struct_field!(io_uring_sqe, user_data);
         check_struct_renamed_field!(io_uring_sqe, buf, __bindgen_anon_4);
         check_struct_field!(io_uring_sqe, personality);
-        check_struct_renamed_field!(io_uring_sqe, splice_fd_in_or_file_index, __bindgen_anon_5);
+        check_struct_renamed_field!(
+            io_uring_sqe,
+            splice_fd_in_or_file_index_or_addr_len,
+            __bindgen_anon_5
+        );
         check_struct_renamed_field!(io_uring_sqe, addr3_or_cmd, __bindgen_anon_6);
 
         check_type!(io_uring_restriction);