Merge branch 'main' into head-continue-after-read-error

Author: rossilor95

.github/workflows/ignore-intermittent.txt

@@ -6,15 +6,18 @@ tests/expand/bounded-memory
 tests/pr/bounded-memory
 tests/tail/inotify-dir-recreate
 tests/tail/overlay-headers
+tests/tail/pid-pipe
 tests/tail/retry
 tests/tail/tail-n0f
 tests/tail/pipe-f
 tests/timeout/timeout
 tests/tail/symlink
 tests/shuf/shuf-reservoir
 tests/sort/sort-stale-thread-mem
+tests/timeout/timeout-group
 tests/tty/tty-eof
 tests/misc/stdbuf
+tests/misc/tty-eof
 tests/misc/usage_vs_getopt
 tests/misc/tee
 tests/tail/follow-name

Cargo.lock

@@ -44,6 +44,10 @@ pub fn main() {
             // Allow this as we have a bunch of info in the comments
             #[allow(clippy::match_same_arms)]
             match krate.as_ref() {
+                #[cfg(not(any(target_os = "linux", target_os = "android")))]
+                "chcon" | "runcon" => {
+                    continue;
+                }
                 "default" | "macos" | "unix" | "windows" | "selinux" | "zip" | "clap_complete"
                 | "clap_mangen" | "fluent_syntax" => continue, // common/standard feature names
                 "nightly" | "test_unimplemented" | "expensive_tests" | "test_risky_names" => {

build.rs

@@ -48,14 +48,11 @@ fluent = { workspace = true }
 foldhash = { workspace = true }
 
 [target.'cfg(all(unix, not(any(target_os = "redox", target_os = "fuchsia", target_os = "haiku", target_os = "solaris", target_os = "illumos"))))'.dependencies]
-rustix = { workspace = true, features = ["process"] }
+rustix = { workspace = true, features = ["system", "process"] }
 
 [target.'cfg(not(any(target_os = "redox", target_os = "wasi")))'.dependencies]
 ctrlc = { workspace = true }
 
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-nix = { workspace = true }
-
 [target.'cfg(unix)'.dependencies]
 libc = { workspace = true }
 

fuzz/Cargo.lock

@@ -83,48 +83,23 @@ fn desired_file_buffer_bytes(total_bytes: u128) -> u128 {
     quarter.max(max)
 }
 
+#[allow(
+    clippy::unnecessary_wraps,
+    reason = "fn sig must match on all platforms"
+)]
 fn physical_memory_bytes() -> Option<u128> {
-    #[cfg(all(
-        target_family = "unix",
-        not(target_os = "redox"),
-        any(target_os = "linux", target_os = "android")
-    ))]
+    #[cfg(any(target_os = "linux", target_os = "android"))]
     {
-        physical_memory_bytes_unix()
+        Some(rustix::system::sysinfo().totalram as u128)
     }
 
-    #[cfg(any(
-        not(target_family = "unix"),
-        target_os = "redox",
-        not(any(target_os = "linux", target_os = "android"))
-    ))]
+    #[cfg(not(any(target_os = "linux", target_os = "android")))]
     {
         // No portable or safe API is available here to detect total physical memory.
         None
     }
 }
 
-#[cfg(all(
-    target_family = "unix",
-    not(target_os = "redox"),
-    any(target_os = "linux", target_os = "android")
-))]
-fn physical_memory_bytes_unix() -> Option<u128> {
-    use nix::unistd::{SysconfVar, sysconf};
-
-    let pages = match sysconf(SysconfVar::_PHYS_PAGES) {
-        Ok(Some(pages)) if pages > 0 => u128::try_from(pages).ok()?,
-        _ => return None,
-    };
-
-    let page_size = match sysconf(SysconfVar::PAGE_SIZE) {
-        Ok(Some(page_size)) if page_size > 0 => u128::try_from(page_size).ok()?,
-        _ => return None,
-    };
-
-    Some(pages.saturating_mul(page_size))
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/uu/sort/Cargo.toml

@@ -10,8 +10,6 @@
     clippy::cast_possible_truncation
 )]
 
-#[cfg(all(unix, feature = "chmod"))]
-use nix::unistd::{close, dup};
 use regex::Regex;
 #[cfg(unix)]
 use rlimit::Resource;
@@ -599,8 +597,8 @@ fn test_ls_io_errors() {
 
         at.touch("some-dir4/bad-fd.txt");
         let fd1 = at.open("some-dir4/bad-fd.txt");
-        let fd2 = dup(dbg!(&fd1)).unwrap();
-        close(fd1).unwrap();
+        let fd2 = rustix::io::dup(dbg!(&fd1)).unwrap();
+        drop(fd1); //close
 
         // on the mac and in certain Linux containers bad fds are typed as dirs,
         // however sometimes bad fds are typed as links and directory entry on links won't fail
@@ -644,7 +642,7 @@ fn test_ls_io_errors() {
             .arg(format!("/dev/fd/{}", fd2.as_raw_fd()))
             .succeeds();
 
-        let _ = close(fd2);
+        drop(fd2); //close
     }
 }
 

src/uu/sort/src/buffer_hint.rs

@@ -1570,10 +1570,9 @@ fn test_wrong_args_exit_code() {
 #[test]
 #[cfg(unix)]
 fn test_tmp_files_deleted_on_sigint() {
-    use std::{fs::read_dir, time::Duration};
-
-    use nix::{sys::signal, unistd::Pid};
     use rand::{RngExt as _, SeedableRng, rngs::SmallRng};
+    use rustix::process::{Pid, Signal, kill_process};
+    use std::{fs::read_dir, time::Duration};
 
     let (at, mut ucmd) = at_and_ucmd!();
     at.mkdir("tmp_dir");
@@ -1609,7 +1608,7 @@ fn test_tmp_files_deleted_on_sigint() {
     // `sort` should have created a temporary directory.
     assert!(read_dir(at.plus("tmp_dir")).unwrap().next().is_some());
     // kill sort with SIGINT
-    signal::kill(Pid::from_raw(child.id() as i32), signal::SIGINT).unwrap();
+    kill_process(Pid::from_raw(child.id() as i32).unwrap(), Signal::INT).unwrap();
     // wait for `sort` to exit
     child.wait().unwrap().code_is(2);
     // `sort` should have deleted the temporary directory again.

tests/by-util/test_ls.rs

@@ -13,23 +13,16 @@
     clippy::cast_possible_truncation
 )]
 
+use pretty_assertions::assert_eq;
+use rand::distr::Alphanumeric;
+use rstest::rstest;
 #[cfg(all(
     not(target_vendor = "apple"),
     not(target_os = "windows"),
     not(target_os = "android"),
     not(target_os = "freebsd")
 ))]
-use nix::sys::signal::{Signal, kill};
-#[cfg(all(
-    not(target_vendor = "apple"),
-    not(target_os = "windows"),
-    not(target_os = "android"),
-    not(target_os = "freebsd")
-))]
-use nix::unistd::Pid;
-use pretty_assertions::assert_eq;
-use rand::distr::Alphanumeric;
-use rstest::rstest;
+use rustix::process::{Pid, Signal, kill_process};
 use std::char::from_digit;
 use std::fs::File;
 use std::io::Write;
@@ -790,7 +783,11 @@ fn test_follow_with_pid() {
         .stdout_only_fixture("foobar_follow_multiple_appended.expected");
 
     // kill the dummy process and give tail time to notice this
-    kill(Pid::from_raw(i32::try_from(pid).unwrap()), Signal::SIGUSR1).unwrap();
+    kill_process(
+        Pid::from_raw(i32::try_from(pid).unwrap()).unwrap(),
+        Signal::USR1,
+    )
+    .unwrap();
     let _ = dummy.wait();
 
     child.delay(DEFAULT_SLEEP_INTERVAL_MILLIS);
@@ -2770,7 +2767,11 @@ fn test_fifo_with_pid() {
 
     child.make_assertion_with_delay(500).is_alive();
 
-    kill(Pid::from_raw(i32::try_from(pid).unwrap()), Signal::SIGUSR1).unwrap();
+    kill_process(
+        Pid::from_raw(i32::try_from(pid).unwrap()).unwrap(),
+        Signal::USR1,
+    )
+    .unwrap();
     let _ = dummy.wait();
 
     child