Merge pull request #3909 from sylvestre/issue-3899

Bump Min Rust and fix test_closes_file_descriptors (Issue 3899)

.clippy.toml

@@ -1 +1 @@
-msrv = "1.56.1"
+msrv = "1.59.0"

.github/workflows/CICD.yml

@@ -13,7 +13,7 @@ env:
   PROJECT_NAME: coreutils
   PROJECT_DESC: "Core universal (cross-platform) utilities"
   PROJECT_AUTH: "uutils"
-  RUST_MIN_SRV: "1.56.1" ## MSRV v1.56.1
+  RUST_MIN_SRV: "1.59.0" ## MSRV v1.59.0
   # * style job configuration
   STYLE_FAIL_ON_FAULT: true ## (bool) fail the build if a style job contains a fault (error or warning); may be overridden on a per-job basis
 

Cargo.toml

@@ -1,7 +1,7 @@
 # coreutils (uutils)
 # * see the repository LICENSE, README, and CONTRIBUTING files for more information
 
-# spell-checker:ignore (libs) libselinux gethostid
+# spell-checker:ignore (libs) libselinux gethostid procfs
 
 [package]
 name = "coreutils"
@@ -16,6 +16,7 @@ repository = "https://github.com/uutils/coreutils"
 readme = "README.md"
 keywords = ["coreutils", "uutils", "cross-platform", "cli", "utility"]
 categories = ["command-line-utilities"]
+rust-version = "1.59.0"
 edition = "2021"
 
 build = "build.rs"
@@ -401,6 +402,7 @@ atty = "0.2"
 hex-literal = "0.3.1"
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dev-dependencies]
+procfs = "0.14"
 rlimit = "0.8.3"
 
 [target.'cfg(unix)'.dev-dependencies]

README.md

@@ -7,7 +7,7 @@
 [![dependency status](https://deps.rs/repo/github/uutils/coreutils/status.svg)](https://deps.rs/repo/github/uutils/coreutils)
 
 [![CodeCov](https://codecov.io/gh/uutils/coreutils/branch/master/graph/badge.svg)](https://codecov.io/gh/uutils/coreutils)
-![MSRV](https://img.shields.io/badge/MSRV-1.56.1-brightgreen)
+![MSRV](https://img.shields.io/badge/MSRV-1.59.0-brightgreen)
 
 -----------------------------------------------
 
@@ -52,7 +52,7 @@ Both can also be generated locally, the instructions for that can be found in th
 ### Rust Version
 
 uutils follows Rust's release channels and is tested against stable, beta and nightly.
-The current Minimum Supported Rust Version (MSRV) is `1.56.1`.
+The current Minimum Supported Rust Version (MSRV) is `1.59.0`.
 
 ## Building
 

deny.toml

@@ -66,6 +66,10 @@ highlight = "all"
 skip = [
     # blake2d_simd
     { name = "arrayvec", version = "=0.7.2" },
+    # chrono
+    { name = "time", version = "=0.1.44" },
+    # chrono => time (the same as the line above)
+    { name = "wasi", "version" = "0.10.0+wasi-snapshot-preview1" },
     # bindgen 0.59.2
     { name = "clap", version = "=2.34.0" },
     { name = "strsim", version = "=0.8.0" },

tests/by-util/test_cp.rs

@@ -1,4 +1,4 @@
-// spell-checker:ignore (flags) reflink (fs) tmpfs (linux) rlimit Rlim NOFILE clob btrfs ROOTDIR USERDIR
+// spell-checker:ignore (flags) reflink (fs) tmpfs (linux) rlimit Rlim NOFILE clob btrfs ROOTDIR USERDIR procfs
 
 use crate::common::util::*;
 #[cfg(not(windows))]
@@ -1379,12 +1379,27 @@ fn test_cp_reflink_insufficient_permission() {
 #[cfg(any(target_os = "linux", target_os = "android"))]
 #[test]
 fn test_closes_file_descriptors() {
+    use procfs::process::Process;
+    let me = Process::myself().unwrap();
+
+    // The test suite runs in parallel, we have pipe, sockets
+    // opened by other tests.
+    // So, we take in account the various fd to increase the limit
+    let number_file_already_opened: u64 = me.fd_count().unwrap().try_into().unwrap();
+    let limit_fd: u64 = number_file_already_opened + 9;
+
+    // For debugging purposes:
+    for f in me.fd().unwrap() {
+        let fd = f.unwrap();
+        println!("{:?} {:?}", fd, fd.mode());
+    }
+
     new_ucmd!()
         .arg("-r")
         .arg("--reflink=auto")
         .arg("dir_with_10_files/")
         .arg("dir_with_10_files_new/")
-        .with_limit(Resource::NOFILE, 9, 9)
+        .with_limit(Resource::NOFILE, limit_fd, limit_fd)
         .succeeds();
 }