Update to io-lifetimes 1.0.

This converts to the new traits, with `From` instead of `IntoFd` and
`FromFd`.

This currently depends on cap-async-std being disabled, since async-std
doesn't yet have the io-safety trait impls yet.

Author: sunfishcode

Cargo.toml

@@ -26,10 +26,10 @@ rand = "0.8.1"
 tempfile = "3.1.0"
 camino = "1.0.5"
 libc = "0.2.100"
-io-lifetimes = "0.7.0"
+io-lifetimes = "1.0.0-rc1"
 
 [target.'cfg(not(windows))'.dev-dependencies]
-rustix = { version = "0.35.6", features = ["fs"] }
+rustix = { version = "0.36.0-rc1", features = ["fs"] }
 
 [target.'cfg(windows)'.dev-dependencies]
 # nt_version uses internal Windows APIs, however we're only using it

cap-async-std/Cargo.toml

@@ -18,13 +18,13 @@ 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.25.0" }
-io-lifetimes = { version = "0.7.0", default-features = false, features = ["async-std"] }
+io-lifetimes = { version = "1.0.0-rc1", default-features = false, features = ["async-std"] }
 ipnet = "2.3.0"
-io-extras = { version = "0.15.0", features = ["use_async_std"] }
+io-extras = { version = "0.16.0-rc1", features = ["use_async_std"] }
 camino = { version = "1.0.5", optional = true }
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.35.6", features = ["fs"] }
+rustix = { version = "0.36.0-rc1", features = ["fs"] }
 
 [features]
 default = []

cap-async-std/src/fs/dir.rs

@@ -14,10 +14,10 @@ use cap_primitives::fs::{
 };
 use cap_primitives::AmbientAuthority;
 #[cfg(not(windows))]
-use io_lifetimes::{AsFd, BorrowedFd, FromFd, IntoFd, OwnedFd};
+use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};
 use io_lifetimes::{AsFilelike, FromFilelike};
 #[cfg(windows)]
-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};
+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};
 use std::fmt;
 #[cfg(unix)]
 use {
@@ -869,10 +869,10 @@ impl FromRawFd for Dir {
 }
 
 #[cfg(not(windows))]
-impl FromFd for Dir {
+impl From<OwnedFd> for Dir {
     #[inline]
-    fn from_fd(fd: OwnedFd) -> Self {
-        Self::from_std_file(fs::File::from_fd(fd))
+    fn from(fd: OwnedFd) -> Self {
+        Self::from_std_file(fs::File::from(fd))
     }
 }
 
@@ -887,10 +887,10 @@ impl FromRawHandle for Dir {
 }
 
 #[cfg(windows)]
-impl FromHandle for Dir {
+impl From<OwnedHandle> for Dir {
     #[inline]
-    fn from_handle(handle: OwnedHandle) -> Self {
-        Self::from_std_file(fs::File::from_handle(handle))
+    fn from(handle: OwnedHandle) -> Self {
+        Self::from_std_file(fs::File::from(handle))
     }
 }
 
@@ -943,10 +943,10 @@ impl IntoRawFd for Dir {
 }
 
 #[cfg(not(windows))]
-impl IntoFd for Dir {
+impl From<Dir> for OwnedFd {
     #[inline]
-    fn into_fd(self) -> OwnedFd {
-        self.std_file.into_fd()
+    fn from(dir: Dir) -> OwnedFd {
+        dir.std_file.into()
     }
 }
 
@@ -959,10 +959,10 @@ impl IntoRawHandle for Dir {
 }
 
 #[cfg(windows)]
-impl IntoHandle for Dir {
+impl From<Dir> for OwnedHandle {
     #[inline]
-    fn into_handle(self) -> OwnedHandle {
-        self.std_file.into_handle()
+    fn from(dir: Dir) -> OwnedHandle {
+        dir.std_file.into()
     }
 }
 

cap-async-std/src/fs/file.rs

@@ -10,9 +10,9 @@ use cap_primitives::fs::{is_file_read_write, open_ambient};
 use cap_primitives::AmbientAuthority;
 use io_lifetimes::AsFilelike;
 #[cfg(not(windows))]
-use io_lifetimes::{AsFd, BorrowedFd, FromFd, IntoFd, OwnedFd};
+use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};
 #[cfg(windows)]
-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};
+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};
 use std::fmt;
 use std::path::Path;
 use std::pin::Pin;
@@ -197,10 +197,10 @@ impl FromRawFd for File {
 }
 
 #[cfg(not(windows))]
-impl FromFd for File {
+impl From<OwnedFd> for File {
     #[inline]
-    fn from_fd(fd: OwnedFd) -> Self {
-        Self::from_std(fs::File::from_fd(fd))
+    fn from(fd: OwnedFd) -> Self {
+        Self::from_std(fs::File::from(fd))
     }
 }
 
@@ -213,10 +213,10 @@ impl FromRawHandle for File {
 }
 
 #[cfg(windows)]
-impl FromHandle for File {
+impl From<OwnedHandle> for File {
     #[inline]
-    fn from_handle(handle: OwnedHandle) -> Self {
-        Self::from_std(fs::File::from_handle(handle))
+    fn from(handle: OwnedHandle) -> Self {
+        Self::from_std(fs::File::from(handle))
     }
 }
 
@@ -269,10 +269,10 @@ impl IntoRawFd for File {
 }
 
 #[cfg(not(windows))]
-impl IntoFd for File {
+impl From<File> for OwnedFd {
     #[inline]
-    fn into_fd(self) -> OwnedFd {
-        self.std.into_fd()
+    fn from(file: File) -> OwnedFd {
+        file.std.into()
     }
 }
 
@@ -285,10 +285,10 @@ impl IntoRawHandle for File {
 }
 
 #[cfg(windows)]
-impl IntoHandle for File {
+impl From<File> for OwnedHandle {
     #[inline]
-    fn into_handle(self) -> OwnedHandle {
-        self.std.into_handle()
+    fn from(file: File) -> OwnedHandle {
+        file.std.into()
     }
 }
 

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

@@ -6,7 +6,7 @@ use cap_primitives::AmbientAuthority;
 #[cfg(not(windows))]
 use io_lifetimes::{AsFd, BorrowedFd, FromFd, IntoFd, OwnedFd};
 #[cfg(windows)]
-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};
+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};
 use std::fmt;
 #[cfg(unix)]
 use {
@@ -644,10 +644,10 @@ impl FromRawFd for Dir {
 }
 
 #[cfg(not(windows))]
-impl FromFd for Dir {
+impl From<OwnedFd> for Dir {
     #[inline]
-    fn from_fd(fd: OwnedFd) -> Self {
-        Self::from_std_file(fs::File::from_fd(fd))
+    fn from(fd: OwnedFd) -> Self {
+        Self::from_std_file(fs::File::from(fd))
     }
 }
 
@@ -662,10 +662,10 @@ impl FromRawHandle for Dir {
 }
 
 #[cfg(windows)]
-impl FromHandle for Dir {
+impl From<OwnedHandle> for Dir {
     #[inline]
-    fn from_handle(handle: OwnedHandle) -> Self {
-        Self::from_std_file(fs::File::from_handle(handle))
+    fn from(handle: OwnedHandle) -> Self {
+        Self::from_std_file(fs::File::from(handle))
     }
 }
 
@@ -718,10 +718,10 @@ impl IntoRawFd for Dir {
 }
 
 #[cfg(not(windows))]
-impl IntoFd for Dir {
+impl From<Dir> for OwnedFd {
     #[inline]
-    fn into_fd(self) -> OwnedFd {
-        self.cap_std.into_fd()
+    fn from(dir: Dir) -> OwnedFd {
+        dir.cap_std.into()
     }
 }
 
@@ -734,10 +734,10 @@ impl IntoRawHandle for Dir {
 }
 
 #[cfg(windows)]
-impl IntoHandle for Dir {
+impl From<Dir> for OwnedHandle {
     #[inline]
-    fn into_handle(self) -> OwnedHandle {
-        self.cap_std.into_handle()
+    fn from(dir: Dir) -> OwnedHandle {
+        dir.cap_std.into()
     }
 }
 

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

@@ -12,7 +12,7 @@ use cap_primitives::AmbientAuthority;
 #[cfg(not(windows))]
 use io_lifetimes::{AsFd, BorrowedFd, FromFd, IntoFd, OwnedFd};
 #[cfg(windows)]
-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};
+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};
 use std::fmt;
 use std::pin::Pin;
 #[cfg(windows)]
@@ -160,10 +160,10 @@ impl FromRawFd for File {
 }
 
 #[cfg(not(windows))]
-impl FromFd for File {
+impl From<OwnedFd> for File {
     #[inline]
-    fn from_fd(fd: OwnedFd) -> Self {
-        Self::from_std(fs::File::from_fd(fd))
+    fn from(fd: OwnedFd) -> Self {
+        Self::from_std(fs::File::from(fd))
     }
 }
 
@@ -176,10 +176,10 @@ impl FromRawHandle for File {
 }
 
 #[cfg(windows)]
-impl FromHandle for File {
+impl From<OwnedHandle> for File {
     #[inline]
-    fn from_handle(handle: OwnedHandle) -> Self {
-        Self::from_std(fs::File::from_handle(handle))
+    fn from(handle: OwnedHandle) -> Self {
+        Self::from_std(fs::File::from(handle))
     }
 }
 
@@ -232,10 +232,10 @@ impl IntoRawFd for File {
 }
 
 #[cfg(not(windows))]
-impl IntoFd for File {
+impl From<File> for OwnedFd {
     #[inline]
-    fn into_fd(self) -> OwnedFd {
-        self.cap_std.into_fd()
+    fn from(file: File) -> OwnedFd {
+        file.cap_std.into()
     }
 }
 
@@ -248,10 +248,10 @@ impl IntoRawHandle for File {
 }
 
 #[cfg(windows)]
-impl IntoHandle for File {
+impl From<File> for OwnedHandle {
     #[inline]
-    fn into_handle(self) -> OwnedHandle {
-        self.cap_std.into_handle()
+    fn from(file: File) -> OwnedHandle {
+        file.cap_std.into()
     }
 }
 

cap-async-std/src/net/tcp_listener.rs

@@ -3,9 +3,9 @@ use crate::net::{Incoming, SocketAddr, TcpStream};
 use async_std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 use async_std::{io, net};
 #[cfg(not(windows))]
-use io_lifetimes::{AsFd, BorrowedFd, FromFd, IntoFd, OwnedFd};
+use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};
 #[cfg(windows)]
-use io_lifetimes::{AsSocket, BorrowedSocket, FromSocket, IntoSocket, OwnedSocket};
+use io_lifetimes::{AsSocket, BorrowedSocket, OwnedSocket};
 use std::fmt;
 #[cfg(windows)]
 use {
@@ -87,10 +87,10 @@ impl FromRawFd for TcpListener {
 }
 
 #[cfg(not(windows))]
-impl FromFd for TcpListener {
+impl From<OwnedFd> for TcpListener {
     #[inline]
-    fn from_fd(fd: OwnedFd) -> Self {
-        Self::from_std(net::TcpListener::from_fd(fd))
+    fn from(fd: OwnedFd) -> Self {
+        Self::from_std(net::TcpListener::from(fd))
     }
 }
 
@@ -103,10 +103,10 @@ impl FromRawSocket for TcpListener {
 }
 
 #[cfg(windows)]
-impl FromSocket for TcpListener {
+impl From<OwnedSocket> for TcpListener {
     #[inline]
-    fn from_socket(socket: OwnedSocket) -> Self {
-        Self::from_std(net::TcpListener::from_socket(socket))
+    fn from(socket: OwnedSocket) -> Self {
+        Self::from_std(net::TcpListener::from(socket))
     }
 }
 
@@ -159,10 +159,10 @@ impl IntoRawFd for TcpListener {
 }
 
 #[cfg(not(windows))]
-impl IntoFd for TcpListener {
+impl From<TcpListener> for OwnedFd {
     #[inline]
-    fn into_fd(self) -> OwnedFd {
-        self.std.into_fd()
+    fn from(listener: TcpListener) -> OwnedFd {
+        listener.std.into()
     }
 }
 
@@ -175,10 +175,10 @@ impl IntoRawSocket for TcpListener {
 }
 
 #[cfg(windows)]
-impl IntoSocket for TcpListener {
+impl From<TcpListener> for OwnedSocket {
     #[inline]
-    fn into_socket(self) -> OwnedSocket {
-        self.std.into_socket()
+    fn from(listener: TcpListener) -> OwnedSocket {
+        listener.std.into()
     }
 }