Update to io-lifetimes 0.7.0.

io-lifetimes needed a semver bump due to `BorrowedFd::borrow_raw_fd`
being renamed to `BorrowedFd::borrow_raw`, to match the corresponding change
in std. cap-std doesn't use this function itself, but since it's a semver
bump, we need to bump it in cap-std so that it uses the new trait versions.

This also updates to [rustix 0.35]:

[rustix 0.35]: https://github.com/bytecodealliance/rustix/releases/tag/v0.35.6

Author: sunfishcode

Cargo.toml

@@ -26,16 +26,16 @@ rand = "0.8.1"
 tempfile = "3.1.0"
 camino = "1.0.5"
 libc = "0.2.100"
-io-lifetimes = "0.5.1"
+io-lifetimes = "0.7.0"
 
 [target.'cfg(not(windows))'.dev-dependencies]
-rustix = "0.33.0"
+rustix = { version = "0.35.6", features = ["fs"] }
 
 [target.'cfg(windows)'.dev-dependencies]
 # nt_version uses internal Windows APIs, however we're only using it
 # for testing here.
 nt_version = "0.1.3"
-winapi = "0.3.9"
+winapi = { version = "0.3.9", features = ["winioctl"] }
 
 [features]
 default = []

cap-async-std/Cargo.toml

@@ -13,17 +13,17 @@ repository = "https://github.com/bytecodealliance/cap-std"
 edition = "2018"
 
 [dependencies]
-arf-strings = { version = "0.6.3", optional = true }
+arf-strings = { version = "0.6.7", optional = true }
 # Enable "unstable" for `spawn_blocking`.
 async-std = { version = "1.10.0", features = ["attributes", "unstable"] }
 cap-primitives = { path = "../cap-primitives", version = "^0.24.1-alpha.0"}
-io-lifetimes = { version = "0.5.1", default-features = false, features = ["async-std"] }
+io-lifetimes = { version = "0.7.0", default-features = false, features = ["async-std"] }
 ipnet = "2.3.0"
-io-extras = { version = "0.13.0", features = ["use_async_std"] }
+io-extras = { version = "0.15.0", features = ["use_async_std"] }
 camino = { version = "1.0.5", optional = true }
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = "0.33.0"
+rustix = { version = "0.35.6", features = ["fs"] }
 
 [features]
 default = []

cap-async-std/src/fs_utf8/mod.rs

@@ -55,7 +55,7 @@ fn to_utf8<P: AsRef<async_std::path::Path>>(path: P) -> std::io::Result<Utf8Path
     #[cfg(not(windows))]
     {
         Ok(Utf8Path::from_path(path.as_ref().into())
-            .ok_or_else(|| ::rustix::io::Error::ILSEQ)?
+            .ok_or_else(|| ::rustix::io::Errno::ILSEQ)?
             .to_path_buf())
     }
 

cap-directories/Cargo.toml

@@ -17,7 +17,7 @@ cap-std = { path = "../cap-std", version = "^0.24.1-alpha.0"}
 directories-next = "2.0.0"
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = "0.33.0"
+rustix = { version = "0.35.6" }
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3.9"

cap-directories/src/lib.rs

@@ -22,7 +22,7 @@ pub use user_dirs::UserDirs;
 
 #[cfg(not(windows))]
 pub(crate) fn not_found() -> io::Error {
-    rustix::io::Error::NOENT.into()
+    rustix::io::Errno::NOENT.into()
 }
 
 #[cfg(windows)]

cap-fs-ext/Cargo.toml

@@ -13,11 +13,11 @@ repository = "https://github.com/bytecodealliance/cap-std"
 edition = "2018"
 
 [dependencies]
-arf-strings = { version = "0.6.3", optional = true }
+arf-strings = { version = "0.6.7", optional = true }
 cap-async-std = { path = "../cap-async-std", optional = true, version = "^0.24.1-alpha.0"}
 cap-std = { path = "../cap-std", optional = true, version = "^0.24.1-alpha.0"}
 cap-primitives = { path = "../cap-primitives", version = "^0.24.1-alpha.0"}
-io-lifetimes = { version = "0.5.1", default-features = false }
+io-lifetimes = { version = "0.7.0", default-features = false }
 # Enable "unstable" for `spawn_blocking`.
 async-std = { version = "1.10.0", features = ["attributes", "unstable"], optional = true }
 async-trait = { version = "0.1.42", optional = true }

cap-primitives/Cargo.toml

@@ -17,12 +17,12 @@ 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.15.0"
-io-extras = "0.13.0"
-io-lifetimes = { version = "0.5.1", default-features = false }
+fs-set-times = "0.17.0"
+io-extras = "0.15.0"
+io-lifetimes = { version = "0.7.0", default-features = false }
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.33.0", features = ["procfs"] }
+rustix = { version = "0.35.6", features = ["fs", "process", "procfs", "termios", "time"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 errno = { version = "0.2.8", default-features = false }
@@ -31,6 +31,6 @@ errno = { version = "0.2.8", default-features = false }
 errno = { version = "0.2.8", default-features = false }
 
 [target.'cfg(windows)'.dependencies]
-winx = "0.31.0"
+winx = "0.33.0"
 winapi = "0.3.9"
 winapi-util = "0.1.5"

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

@@ -120,24 +120,24 @@ pub(crate) fn copy_impl(
             let copy_result = copy_file_range(&reader, None, &writer, None, bytes_to_copy);
             if let Err(copy_err) = copy_result {
                 match copy_err {
-                    rustix::io::Error::NOSYS | rustix::io::Error::PERM => {
+                    rustix::io::Errno::NOSYS | rustix::io::Errno::PERM => {
                         HAS_COPY_FILE_RANGE.store(false, Ordering::Relaxed);
                     }
                     _ => {}
                 }
             }
             copy_result
         } else {
-            Err(rustix::io::Error::NOSYS.into())
+            Err(rustix::io::Errno::NOSYS.into())
         };
         match copy_result {
             Ok(ret) => written += ret as u64,
             Err(err) => {
                 match err {
-                    rustix::io::Error::NOSYS
-                    | rustix::io::Error::XDEV
-                    | rustix::io::Error::INVAL
-                    | rustix::io::Error::PERM => {
+                    rustix::io::Errno::NOSYS
+                    | rustix::io::Errno::XDEV
+                    | rustix::io::Errno::INVAL
+                    | rustix::io::Errno::PERM => {
                         // Try fallback io::copy if either:
                         // - Kernel version is < 4.5 (ENOSYS)
                         // - Files are mounted on different fs (EXDEV)
@@ -193,10 +193,10 @@ pub(crate) fn copy_impl(
                 // destination already exists, or if the source and destination
                 // are on different devices. In all these cases `fcopyfile`
                 // should succeed.
-                rustix::io::Error::NOTSUP | rustix::io::Error::EXIST | rustix::io::Error::XDEV => {
+                rustix::io::Errno::NOTSUP | rustix::io::Errno::EXIST | rustix::io::Errno::XDEV => {
                     ()
                 }
-                rustix::io::Error::NOSYS => HAS_FCLONEFILEAT.store(false, Ordering::Relaxed),
+                rustix::io::Errno::NOSYS => HAS_FCLONEFILEAT.store(false, Ordering::Relaxed),
                 _ => return Err(err.into()),
             },
         }

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

@@ -2,25 +2,25 @@ use std::io;
 
 #[cold]
 pub(crate) fn invalid_flags() -> io::Error {
-    rustix::io::Error::INVAL.into()
+    rustix::io::Errno::INVAL.into()
 }
 
 #[cold]
 pub(crate) fn no_such_file_or_directory() -> io::Error {
-    rustix::io::Error::NOENT.into()
+    rustix::io::Errno::NOENT.into()
 }
 
 #[cold]
 pub(crate) fn is_directory() -> io::Error {
-    rustix::io::Error::ISDIR.into()
+    rustix::io::Errno::ISDIR.into()
 }
 
 #[cold]
 pub(crate) fn is_not_directory() -> io::Error {
-    rustix::io::Error::NOTDIR.into()
+    rustix::io::Errno::NOTDIR.into()
 }
 
 #[cold]
 pub(crate) fn too_many_symlinks() -> io::Error {
-    rustix::io::Error::LOOP.into()
+    rustix::io::Errno::LOOP.into()
 }

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

@@ -1,6 +1,6 @@
 use crate::fs::file_path_by_searching;
 #[cfg(not(any(target_os = "wasi", target_os = "fuchsia")))]
-use rustix::io::ttyname;
+use rustix::termios::ttyname;
 #[cfg(not(any(target_os = "wasi", target_os = "fuchsia")))]
 use std::ffi::OsString;
 use std::fs;