Fix macOS aarch64 compile errors (#1724)

.github/workflows/CICD.yml

@@ -11,7 +11,7 @@ env:
   PROJECT_NAME: coreutils
   PROJECT_DESC: "Core universal (cross-platform) utilities"
   PROJECT_AUTH: "uutils"
-  RUST_MIN_SRV: "1.32.0" ## v1.32.0 - minimum version for half, tempfile, etc
+  RUST_MIN_SRV: "1.33.0" ## v1.33.0 - minimum version for tempfile 3.1.0 and libc needed for aarch64
   RUST_COV_SRV: "2020-08-01" ## (~v1.47.0) supported rust version for code coverage; (date required/used by 'coverage') ## !maint: refactor when code coverage support is included in the stable channel
 
 on: [push, pull_request]

README.md

@@ -42,7 +42,7 @@ Requirements
 ### Rust Version ###
 
 uutils follows Rust's release channels and is tested against stable, beta and nightly.
-The current oldest supported version of the Rust compiler is `1.32.0`.
+The current oldest supported version of the Rust compiler is `1.33.0`.
 
 On both Windows and Redox, only the nightly version is tested currently.
 

src/uu/cp/Cargo.toml

@@ -21,7 +21,7 @@ path = "src/cp.rs"
 [dependencies]
 clap = "2.33"
 filetime = "0.2"
-libc = "0.2.42"
+libc = "0.2.85"
 quick-error = "1.2.3"
 uucore = { version=">=0.0.6", package="uucore", path="../../uucore", features=["fs"] }
 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }

src/uu/df/src/df.rs

@@ -215,9 +215,9 @@ extern "C" {
     #[link_name = "getmntinfo$INODE64"]
     fn getmntinfo(mntbufp: *mut *mut statfs, flags: c_int) -> c_int;
 
-    #[cfg(all(
-        target_os = "freebsd",
-        not(all(target_os = "macos", target_arch = "x86_64"))
+    #[cfg(any(
+        all(target_os = "freebsd"),
+        all(target_os = "macos", target_arch = "aarch64")
     ))]
     fn getmntinfo(mntbufp: *mut *mut statfs, flags: c_int) -> c_int;
 }
@@ -753,7 +753,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                 .takes_value(true)
                 .help(
                     "scale sizes by SIZE before printing them; e.g.\
-                      '-BM' prints sizes in units of 1,048,576 bytes",
+                     '-BM' prints sizes in units of 1,048,576 bytes",
                 ),
         )
         .arg(
@@ -810,7 +810,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                 .use_delimiter(true)
                 .help(
                     "use the output format defined by FIELD_LIST,\
-                    or print all fields if FIELD_LIST is omitted.",
+                     or print all fields if FIELD_LIST is omitted.",
                 ),
         )
         .arg(

src/uucore/Cargo.toml

@@ -27,7 +27,7 @@ platform-info = { version="<= 0.0.1", optional=true }
 time = { version="<= 0.1.42", optional=true }
 # * "problem" dependencies (pinned)
 data-encoding = { version="~2.1", optional=true } ## data-encoding: require v2.1; but v2.2.0 breaks the build for MinSRV v1.31.0
-libc = { version="0.2.15, <= 0.2.66", optional=true } ## libc: initial utmp support added in v0.2.15; but v0.2.68 breaks the build for MinSRV v1.31.0
+libc = { version="0.2.15, <= 0.2.85", optional=true } ## libc: initial utmp support added in v0.2.15; but v0.2.68 breaks the build for MinSRV v1.31.0
 
 [target.'cfg(target_os = "redox")'.dependencies]
 termion = "1.5"

tests/by-util/test_tail.rs

@@ -95,8 +95,8 @@ fn test_follow_stdin() {
         .stdout_is_fixture("follow_stdin.expected");
 }
 
-// FixME: test PASSES for usual windows builds, but fails for coverage testing builds (likely related to the specific RUSTFLAGS '-Zpanic_abort_tests -Cpanic=abort')
-#[cfg(not(windows))]
+// FixME: test PASSES for usual windows builds, but fails for coverage testing builds (likely related to the specific RUSTFLAGS '-Zpanic_abort_tests -Cpanic=abort')  This test also breaks tty settings under bash requiring a 'stty sane' or reset.
+#[cfg(disable_until_fixed)]
 #[test]
 fn test_follow_with_pid() {
     use std::process::{Command, Stdio};