Merge branch 'bytecodealliance:main' into fix/manual-filter-lint

Author: tangaac

.github/workflows/main.yml

@@ -54,6 +54,7 @@ jobs:
         cargo update --package=half --precise=2.2.1
         cargo update --package=flate2 --precise=1.0.35
         cargo update --package=serde --precise=1.0.228
+        cargo update --package=web-sys --precise=0.3.104
         cargo update --package=syn --precise=2.0.106
         cargo update --package=textwrap --precise=0.16.1
         cargo update --package=parking_lot --precise=0.12.4
@@ -596,6 +597,7 @@ jobs:
         cargo update --package=half --precise=2.2.1
         cargo update --package=flate2 --precise=1.0.35
         cargo update --package=serde --precise=1.0.228
+        cargo update --package=web-sys --precise=0.3.104
         cargo update --package=syn --precise=2.0.106
         cargo update --package=textwrap --precise=0.16.1
         cargo update --package=parking_lot --precise=0.12.4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustix"
-version = "1.1.4"
+version = "1.1.5"
 authors = [
     "Dan Gohman <dev@sunfishcode.online>",
     "Jakub Konka <kubkon@jakubkonka.com>",
@@ -170,7 +170,7 @@ stdio = []
 # Enable `rustix::system::*`.
 system = ["linux-raw-sys/system"]
 
-# Enable `rustix::runtime::*`. ⚠ This API is undocumented and unstable and
+# Enable `rustix::runtime_*::*`. ⚠ This API is undocumented and unstable and
 # experimental and not intended for general-purpose use. ⚠
 runtime = ["linux-raw-sys/prctl"]
 

build.rs

@@ -188,6 +188,11 @@ fn main() {
     println!("cargo:rerun-if-env-changed=CARGO_FEATURE_USE_LIBC");
     println!("cargo:rerun-if-env-changed=CARGO_FEATURE_RUSTC_DEP_OF_STD");
     println!("cargo:rerun-if-env-changed=CARGO_CFG_MIRI");
+
+    // Remove the can_compile() probe artifact so OUT_DIR ends up empty.
+    // The emitted metadata is not byte-reproducible, and a nondeterministic
+    // OUT_DIR destabilizes the cache keys of some build systems like Bazel.
+    let _ = std::fs::remove_file(probe_file());
 }
 
 fn use_thumb_mode() -> bool {
@@ -219,6 +224,10 @@ fn has_feature(feature: &str) -> bool {
     ))
 }
 
+fn probe_file() -> PathBuf {
+    PathBuf::from(var("OUT_DIR").unwrap()).join("rustix_test_can_compile")
+}
+
 /// Test whether the rustc at `var("RUSTC")` can compile the given code.
 fn can_compile<T: AsRef<str>>(test: T) -> bool {
     use std::process::Stdio;
@@ -240,14 +249,12 @@ fn can_compile<T: AsRef<str>>(test: T) -> bool {
         std::process::Command::new(rustc)
     };
 
-    let out_dir = var("OUT_DIR").unwrap();
-    let out_file = PathBuf::from(out_dir).join("rustix_test_can_compile");
     cmd.arg("--crate-type=rlib") // Don't require `main`.
         .arg("--emit=metadata") // Do as little as possible but still parse.
         .arg("--target")
         .arg(target)
         .arg("-o")
-        .arg(out_file)
+        .arg(probe_file())
         .stdout(Stdio::null()); // We don't care about the output (only whether it builds or not)
 
     // If Cargo wants to set RUSTFLAGS, use that.

src/backend/libc/c.rs

@@ -474,30 +474,27 @@ mod readwrite_pv64v2 {
 ))]
 pub(super) use readwrite_pv64v2::{preadv64v2 as preadv2, pwritev64v2 as pwritev2};
 
-// Rust's libc crate lacks statx for Non-glibc targets.
+// Rust's libc crate > v0.2.189 may also define these constants,
+// so we use an explicit import.
 #[cfg(feature = "fs")]
 #[cfg(all(
     linux_like,
     linux_raw_dep,
     not(any(
+        target_os = "android",
         target_os = "emscripten",
         target_env = "gnu",
         all(target_arch = "loongarch64", target_env = "musl")
     ))
 ))]
-mod statx_flags {
-    pub(crate) use linux_raw_sys::general::{
-        STATX_ALL, STATX_ATIME, STATX_BASIC_STATS, STATX_BLOCKS, STATX_BTIME, STATX_CTIME,
-        STATX_DIOALIGN, STATX_GID, STATX_INO, STATX_MNT_ID, STATX_MODE, STATX_MTIME, STATX_NLINK,
-        STATX_SIZE, STATX_TYPE, STATX_UID,
-    };
-
-    pub(crate) use linux_raw_sys::general::{
-        STATX_ATTR_APPEND, STATX_ATTR_AUTOMOUNT, STATX_ATTR_COMPRESSED, STATX_ATTR_DAX,
-        STATX_ATTR_ENCRYPTED, STATX_ATTR_IMMUTABLE, STATX_ATTR_MOUNT_ROOT, STATX_ATTR_NODUMP,
-        STATX_ATTR_VERITY,
-    };
-}
+pub(crate) use linux_raw_sys::general::{
+    STATX_ALL, STATX_ATIME, STATX_BASIC_STATS, STATX_BLOCKS, STATX_BTIME, STATX_CTIME,
+    STATX_DIOALIGN, STATX_GID, STATX_INO, STATX_MNT_ID, STATX_MODE, STATX_MTIME, STATX_NLINK,
+    STATX_SIZE, STATX_TYPE, STATX_UID,
+};
+
+// Rust's libc crate > v0.2.189 may also define these constants,
+// so we use an explicit import.
 #[cfg(feature = "fs")]
 #[cfg(all(
     linux_like,
@@ -509,7 +506,11 @@ mod statx_flags {
         all(target_arch = "loongarch64", target_env = "musl")
     ))
 ))]
-pub(crate) use statx_flags::*;
+pub(crate) use linux_raw_sys::general::{
+    STATX_ATTR_APPEND, STATX_ATTR_AUTOMOUNT, STATX_ATTR_COMPRESSED, STATX_ATTR_DAX,
+    STATX_ATTR_ENCRYPTED, STATX_ATTR_IMMUTABLE, STATX_ATTR_MOUNT_ROOT, STATX_ATTR_NODUMP,
+    STATX_ATTR_VERITY,
+};
 
 #[cfg(feature = "fs")]
 #[cfg(target_os = "android")]

src/backend/libc/conv.rs

@@ -3,7 +3,10 @@
 //! for converting between rustix's types and libc types.
 
 use super::c;
-#[cfg(all(feature = "alloc", not(any(windows, target_os = "espidf"))))]
+#[cfg(all(
+    feature = "alloc",
+    not(any(windows, target_os = "espidf", target_os = "horizon"))
+))]
 use super::fd::IntoRawFd as _;
 use super::fd::{AsRawFd as _, BorrowedFd, FromRawFd as _, LibcFd, OwnedFd, RawFd};
 #[cfg(not(windows))]
@@ -35,7 +38,12 @@ pub(super) fn borrowed_fd(fd: BorrowedFd<'_>) -> LibcFd {
 
 #[cfg(all(
     feature = "alloc",
-    not(any(windows, target_os = "espidf", target_os = "redox"))
+    not(any(
+        windows,
+        target_os = "espidf",
+        target_os = "horizon",
+        target_os = "redox"
+    ))
 ))]
 #[inline]
 pub(super) fn owned_fd(fd: OwnedFd) -> LibcFd {

src/backend/libc/event/poll_fd.rs

@@ -8,13 +8,18 @@ use bitflags::bitflags;
 use core::fmt;
 use core::marker::PhantomData;
 
+#[cfg(not(target_os = "horizon"))]
+pub(crate) type RawPollFlags = ffi::c_short;
+#[cfg(target_os = "horizon")]
+pub(crate) type RawPollFlags = ffi::c_int;
+
 bitflags! {
     /// `POLL*` flags for use with [`poll`].
     ///
     /// [`poll`]: crate::event::poll
     #[repr(transparent)]
     #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-    pub struct PollFlags: ffi::c_short {
+    pub struct PollFlags: RawPollFlags {
         /// `POLLIN`
         const IN = c::POLLIN;
         /// `POLLPRI`

src/backend/libc/event/syscalls.rs

@@ -247,11 +247,7 @@ pub(crate) unsafe fn select(
     let timeout_data;
     let timeout_ptr = match timeout {
         Some(timeout) => {
-            // Convert from `Timespec` to `c::timeval`.
-            timeout_data = c::timeval {
-                tv_sec: timeout.tv_sec.try_into().map_err(|_| io::Errno::INVAL)?,
-                tv_usec: ((timeout.tv_nsec + 999) / 1000) as _,
-            };
+            timeout_data = timeout.to_timeval()?;
             &timeout_data
         }
         None => null(),
@@ -324,11 +320,7 @@ pub(crate) unsafe fn select(
     let timeout_data;
     let timeout_ptr = match timeout {
         Some(timeout) => {
-            // Convert from `Timespec` to `c::timeval`.
-            timeout_data = c::timeval {
-                tv_sec: timeout.tv_sec.try_into().map_err(|_| io::Errno::INVAL)?,
-                tv_usec: ((timeout.tv_nsec + 999) / 1000) as _,
-            };
+            timeout_data = timeout.to_timeval()?;
             &timeout_data
         }
         None => null(),

src/backend/libc/event/windows_syscalls.rs

@@ -54,14 +54,7 @@ pub(crate) fn select(
     let timeout_data;
     let timeout_ptr = match timeout {
         Some(timeout) => {
-            // Convert from `Timespec` to `TIMEVAL`.
-            timeout_data = c::TIMEVAL {
-                tv_sec: timeout
-                    .tv_sec
-                    .try_into()
-                    .map_err(|_| io::Errno::OPNOTSUPP)?,
-                tv_usec: ((timeout.tv_nsec + 999) / 1000) as _,
-            };
+            timeout_data = timeout.to_timeval()?;
             &timeout_data
         }
         None => null(),

src/backend/libc/fs/mod.rs

@@ -1,4 +1,7 @@
-#[cfg(all(feature = "alloc", not(any(target_os = "espidf", target_os = "redox"))))]
+#[cfg(all(
+    feature = "alloc",
+    not(any(target_os = "espidf", target_os = "horizon", target_os = "redox"))
+))]
 pub(crate) mod dir;
 #[cfg(linux_kernel)]
 pub mod inotify;

src/backend/libc/fs/syscalls.rs

@@ -49,11 +49,12 @@ use crate::fs::SealFlags;
     target_os = "wasi",
 )))]
 use crate::fs::StatFs;
-#[cfg(not(any(target_os = "espidf", target_os = "vita")))]
+#[cfg(not(any(target_os = "espidf", target_os = "horizon", target_os = "vita")))]
 use crate::fs::Timestamps;
 #[cfg(not(any(
     apple,
     target_os = "espidf",
+    target_os = "horizon",
     target_os = "redox",
     target_os = "vita",
     target_os = "wasi"
@@ -941,6 +942,7 @@ pub(crate) fn utimensat(
                 c::c_int
             ) -> c::c_int
         }
+        #[cfg(not(any(target_os = "tvos", target_os = "watchos")))]
         extern "C" {
             fn setattrlist(
                 path: *const ffi::c_char,
@@ -950,6 +952,7 @@ pub(crate) fn utimensat(
                 options: c::c_ulong,
             ) -> c::c_int;
         }
+        #[cfg(not(any(target_os = "tvos", target_os = "watchos")))]
         const FSOPT_NOFOLLOW: c::c_ulong = 0x0000_0001;
 
         // If we have `utimensat`, use it.
@@ -962,15 +965,22 @@ pub(crate) fn utimensat(
             ));
         }
 
+        // Return `NOSYS` on platforms where `utimensat` cannot be emulated
+        // because `fork` is unavailable.
+        #[cfg(any(target_os = "tvos", target_os = "watchos"))]
+        return Err(io::Errno::NOSYS);
+
         // Convert `times`. We only need this in the child, but do it before
         // calling `fork` because it might fail.
+        #[cfg(not(any(target_os = "tvos", target_os = "watchos")))]
         let (attrbuf_size, times, attrs) = times_to_attrlist(times)?;
 
         // `setattrlistat` was introduced in 10.13 along with `utimensat`, so
         // if we don't have `utimensat`, we don't have `setattrlistat` either.
         // Emulate it using `fork`, and `fchdir` and [`setattrlist`].
         //
         // [`setattrlist`]: https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man2/setattrlist.2.html
+        #[cfg(not(any(target_os = "tvos", target_os = "watchos")))]
         match c::fork() {
             -1 => Err(io::Errno::IO),
             0 => {