Update to rustix 0.37. (#297)

The only code change here is due to `copy_file_range`'s `len` argument
changing from `u64` to `usize`.

Author: sunfishcode

Cargo.toml

@@ -32,7 +32,7 @@ libc = "0.2.100"
 io-lifetimes = "1.0.0"
 
 [target.'cfg(not(windows))'.dev-dependencies]
-rustix = { version = "0.36.0", features = ["fs"] }
+rustix = { version = "0.37.0", features = ["fs"] }
 
 [target.'cfg(windows)'.dev-dependencies]
 # nt_version uses internal Windows APIs, however we're only using it

cap-async-std/Cargo.toml

@@ -24,7 +24,7 @@ io-extras = { version = "0.17.0", features = ["use_async_std"] }
 camino = { version = "1.0.5", optional = true }
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.36.0", features = ["fs"] }
+rustix = { version = "0.37.0", features = ["fs"] }
 
 [features]
 default = []

cap-directories/Cargo.toml

@@ -17,7 +17,7 @@ cap-std = { path = "../cap-std", version = "^1.0.5" }
 directories-next = "2.0.0"
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.36.0" }
+rustix = { version = "0.37.0" }
 
 [target.'cfg(windows)'.dependencies.windows-sys]
 version = "0.45.0"

cap-primitives/Cargo.toml

@@ -17,15 +17,15 @@ ambient-authority = "0.0.1"
 arbitrary = { version = "1.0.0", optional = true, features = ["derive"] }
 ipnet = "2.3.0"
 maybe-owned = "0.3.4"
-fs-set-times = "0.18.0"
+fs-set-times = "0.19.0"
 io-extras = "0.17.0"
 io-lifetimes = { version = "1.0.0", default-features = false }
 
 [dev-dependencies]
 cap-tempfile = { path = "../cap-tempfile" }
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.36.0", features = ["fs", "process", "procfs", "termios", "time"] }
+rustix = { version = "0.37.0", features = ["fs", "process", "procfs", "termios", "time"] }
 
 [target.'cfg(windows)'.dependencies]
 winx = "0.35.0"

cap-primitives/src/rustix/fs/copy_impl.rs

@@ -10,6 +10,8 @@ use rustix::fs::{
     copyfile_state_alloc, copyfile_state_free, copyfile_state_get_copied, copyfile_state_t,
     fclonefileat, fcopyfile, CloneFlags, CopyfileFlags,
 };
+#[cfg(any(target_os = "android", target_os = "linux"))]
+use std::convert::TryFrom;
 use std::path::Path;
 use std::{fs, io};
 
@@ -115,6 +117,11 @@ pub(crate) fn copy_impl(
     while written < len {
         let copy_result = if has_copy_file_range {
             let bytes_to_copy = cmp::min(len - written, usize::MAX as u64);
+
+            // `copy_file_range` takes a `usize`; convert with saturation so
+            // that we copy as many bytes as we can.
+            let bytes_to_copy = usize::try_from(bytes_to_copy).unwrap_or(usize::MAX);
+
             // We actually don't have to adjust the offsets,
             // because copy_file_range adjusts the file offset automatically
             let copy_result = copy_file_range(&reader, None, &writer, None, bytes_to_copy);

cap-std/Cargo.toml

@@ -25,7 +25,7 @@ io-lifetimes = { version = "1.0.0", default-features = false }
 camino = { version = "1.0.5", optional = true }
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.36.0", features = ["fs"] }
+rustix = { version = "0.37.0", features = ["fs"] }
 
 [features]
 default = []

cap-tempfile/Cargo.toml

@@ -21,7 +21,7 @@ camino = { version = "1.0.5", optional = true }
 rand = "0.8.1"
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.36.0", features = ["procfs"] }
+rustix = { version = "0.37.0", features = ["procfs"] }
 
 [target.'cfg(windows)'.dev-dependencies.windows-sys]
 version = "0.45.0"

cap-time-ext/Cargo.toml

@@ -17,7 +17,7 @@ cap-primitives = { path = "../cap-primitives", version = "^1.0.5" }
 cap-std = { path = "../cap-std", optional = true, version = "^1.0.5" }
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.36.0", features = ["time"] }
+rustix = { version = "0.37.0", features = ["time"] }
 
 [target.'cfg(windows)'.dependencies]
 once_cell = "1.5.2"