Port to the new Windows io_safety traits.

sunfishcode · sunfishcode · commit 14af59c8975f · 2022-08-23T14:59:22.000-07:00
diff --git a/cap-async-std/src/fs/dir.rs b/cap-async-std/src/fs/dir.rs
@@ -17,7 +17,7 @@ use cap_primitives::AmbientAuthority;
 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 {
@@ -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))
     }
 }
 
@@ -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()
     }
 }
 
diff --git a/cap-async-std/src/fs/file.rs b/cap-async-std/src/fs/file.rs
@@ -12,7 +12,7 @@ use io_lifetimes::AsFilelike;
 #[cfg(not(windows))]
 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;
@@ -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))
     }
 }
 
@@ -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()
     }
 }
 
diff --git a/cap-async-std/src/fs_utf8/dir.rs b/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 {
@@ -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))
     }
 }
 
@@ -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()
     }
 }
 
diff --git a/cap-async-std/src/fs_utf8/file.rs b/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)]
@@ -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))
     }
 }
 
@@ -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()
     }
 }
 
diff --git a/cap-async-std/src/net/tcp_listener.rs b/cap-async-std/src/net/tcp_listener.rs
@@ -5,7 +5,7 @@ use async_std::{io, net};
 #[cfg(not(windows))]
 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 {
@@ -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))
     }
 }
 
@@ -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()
     }
 }
 
diff --git a/cap-async-std/src/net/tcp_stream.rs b/cap-async-std/src/net/tcp_stream.rs
@@ -7,7 +7,7 @@ use async_std::task::{Context, Poll};
 #[cfg(not(windows))]
 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;
 use std::pin::Pin;
 #[cfg(windows)]
@@ -147,10 +147,10 @@ impl FromRawSocket for TcpStream {
 }
 
 #[cfg(windows)]
-impl FromSocket for TcpStream {
+impl From<OwnedSocket> for TcpStream {
     #[inline]
-    fn from_socket(socket: OwnedSocket) -> Self {
-        Self::from_std(net::TcpStream::from_socket(socket))
+    fn from(socket: OwnedSocket) -> Self {
+        Self::from_std(net::TcpStream::from(socket))
     }
 }
 
@@ -219,10 +219,10 @@ impl IntoRawSocket for TcpStream {
 }
 
 #[cfg(windows)]
-impl IntoSocket for TcpStream {
+impl From<TcpStream> for OwnedSocket {
     #[inline]
-    fn into_socket(self) -> OwnedSocket {
-        self.std.into_socket()
+    fn from(stream: TcpStream) -> OwnedSocket {
+        stream.std.into()
     }
 }
 
diff --git a/cap-async-std/src/net/udp_socket.rs b/cap-async-std/src/net/udp_socket.rs
@@ -5,7 +5,7 @@ use async_std::{io, net};
 #[cfg(not(windows))]
 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 {
@@ -248,10 +248,10 @@ impl FromRawSocket for UdpSocket {
 }
 
 #[cfg(windows)]
-impl FromSocket for UdpSocket {
+impl From<OwnedSocket> for UdpSocket {
     #[inline]
-    fn from_socket(socket: OwnedSocket) -> Self {
-        Self::from_std(net::UdpSocket::from_socket(socket))
+    fn from(socket: OwnedSocket) -> Self {
+        Self::from_std(net::UdpSocket::from(socket))
     }
 }
 
@@ -320,10 +320,10 @@ impl IntoRawSocket for UdpSocket {
 }
 
 #[cfg(windows)]
-impl IntoSocket for UdpSocket {
+impl From<UdpSocket> for OwnedSocket {
     #[inline]
-    fn into_socket(self) -> OwnedSocket {
-        self.std.into_socket()
+    fn from(socket: UdpSocket) -> OwnedSocket {
+        self.std.into()
     }
 }
 
diff --git a/cap-std/src/fs/dir.rs b/cap-std/src/fs/dir.rs
@@ -13,7 +13,7 @@ use io_lifetimes::AsFilelike;
 #[cfg(not(windows))]
 use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};
 #[cfg(windows)]
-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};
+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};
 #[cfg(target_os = "wasi")]
 use rustix::fs::OpenOptionsExt;
 use std::io::{self, Read, Write};
@@ -709,10 +709,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))
     }
 }
 
@@ -781,10 +781,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()
     }
 }
 
diff --git a/cap-std/src/fs_utf8/dir.rs b/cap-std/src/fs_utf8/dir.rs
@@ -9,7 +9,7 @@ use io_extras::os::rustix::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 #[cfg(not(windows))]
 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, fs, io};
 #[cfg(windows)]
 use {
@@ -646,12 +646,12 @@ impl FromRawHandle for Dir {
 }
 
 #[cfg(windows)]
-impl FromHandle for Dir {
+impl From<OwnedHandle> for Dir {
     /// To prevent race conditions on Windows, the handle must be opened
     /// without `FILE_SHARE_DELETE`.
     #[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))
     }
 }
 
@@ -720,10 +720,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()
     }
 }
 
diff --git a/cap-std/src/fs_utf8/file.rs b/cap-std/src/fs_utf8/file.rs
@@ -7,7 +7,7 @@ use io_extras::os::rustix::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 #[cfg(not(windows))]
 use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};
 #[cfg(windows)]
-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};
+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};
 use std::io::{self, IoSlice, IoSliceMut, Read, Seek, SeekFrom, Write};
 #[cfg(target_os = "wasi")]
 use std::path::Path;
@@ -182,10 +182,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))
     }
 }
 
@@ -254,10 +254,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()
     }
 }
 
diff --git a/cap-std/src/net/tcp_listener.rs b/cap-std/src/net/tcp_listener.rs
diff --git a/cap-std/src/net/tcp_stream.rs b/cap-std/src/net/tcp_stream.rs
diff --git a/cap-std/src/net/udp_socket.rs b/cap-std/src/net/udp_socket.rs

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ use cap_primitives::AmbientAuthority;`
`17`	`17`	`use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};`
`18`	`18`	`use io_lifetimes::{AsFilelike, FromFilelike};`
`19`	`19`	`#[cfg(windows)]`
`20`		`-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};`
	`20`	`+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};`
`21`	`21`	`use std::fmt;`
`22`	`22`	`#[cfg(unix)]`
`23`	`23`	`use {`
`@@ -887,10 +887,10 @@ impl FromRawHandle for Dir {`
`887`	`887`	`}`
`888`	`888`
`889`	`889`	`#[cfg(windows)]`
`890`		`-impl FromHandle for Dir {`
	`890`	`+impl From<OwnedHandle> for Dir {`
`891`	`891`	`#[inline]`
`892`		`- fn from_handle(handle: OwnedHandle) -> Self {`
`893`		`- Self::from_std_file(fs::File::from_handle(handle))`
	`892`	`+ fn from(handle: OwnedHandle) -> Self {`
	`893`	`+ Self::from_std_file(fs::File::from(handle))`
`894`	`894`	`}`
`895`	`895`	`}`
`896`	`896`
`@@ -959,10 +959,10 @@ impl IntoRawHandle for Dir {`
`959`	`959`	`}`
`960`	`960`
`961`	`961`	`#[cfg(windows)]`
`962`		`-impl IntoHandle for Dir {`
	`962`	`+impl From<Dir> for OwnedHandle {`
`963`	`963`	`#[inline]`
`964`		`- fn into_handle(self) -> OwnedHandle {`
`965`		`- self.std_file.into_handle()`
	`964`	`+ fn from(dir: Dir) -> OwnedHandle {`
	`965`	`+ dir.std_file.into()`
`966`	`966`	`}`
`967`	`967`	`}`
`968`	`968`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ use io_lifetimes::AsFilelike;`
`12`	`12`	`#[cfg(not(windows))]`
`13`	`13`	`use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};`
`14`	`14`	`#[cfg(windows)]`
`15`		`-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};`
	`15`	`+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};`
`16`	`16`	`use std::fmt;`
`17`	`17`	`use std::path::Path;`
`18`	`18`	`use std::pin::Pin;`
`@@ -213,10 +213,10 @@ impl FromRawHandle for File {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`#[cfg(windows)]`
`216`		`-impl FromHandle for File {`
	`216`	`+impl From<OwnedHandle> for File {`
`217`	`217`	`#[inline]`
`218`		`- fn from_handle(handle: OwnedHandle) -> Self {`
`219`		`- Self::from_std(fs::File::from_handle(handle))`
	`218`	`+ fn from(handle: OwnedHandle) -> Self {`
	`219`	`+ Self::from_std(fs::File::from(handle))`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`@@ -285,10 +285,10 @@ impl IntoRawHandle for File {`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`#[cfg(windows)]`
`288`		`-impl IntoHandle for File {`
	`288`	`+impl From<File> for OwnedHandle {`
`289`	`289`	`#[inline]`
`290`		`- fn into_handle(self) -> OwnedHandle {`
`291`		`- self.std.into_handle()`
	`290`	`+ fn from(file: File) -> OwnedHandle {`
	`291`	`+ file.std.into()`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use cap_primitives::AmbientAuthority;`
`6`	`6`	`#[cfg(not(windows))]`
`7`	`7`	`use io_lifetimes::{AsFd, BorrowedFd, FromFd, IntoFd, OwnedFd};`
`8`	`8`	`#[cfg(windows)]`
`9`		`-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};`
	`9`	`+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};`
`10`	`10`	`use std::fmt;`
`11`	`11`	`#[cfg(unix)]`
`12`	`12`	`use {`
`@@ -662,10 +662,10 @@ impl FromRawHandle for Dir {`
`662`	`662`	`}`
`663`	`663`
`664`	`664`	`#[cfg(windows)]`
`665`		`-impl FromHandle for Dir {`
	`665`	`+impl From<OwnedHandle> for Dir {`
`666`	`666`	`#[inline]`
`667`		`- fn from_handle(handle: OwnedHandle) -> Self {`
`668`		`- Self::from_std_file(fs::File::from_handle(handle))`
	`667`	`+ fn from(handle: OwnedHandle) -> Self {`
	`668`	`+ Self::from_std_file(fs::File::from(handle))`
`669`	`669`	`}`
`670`	`670`	`}`
`671`	`671`
`@@ -734,10 +734,10 @@ impl IntoRawHandle for Dir {`
`734`	`734`	`}`
`735`	`735`
`736`	`736`	`#[cfg(windows)]`
`737`		`-impl IntoHandle for Dir {`
	`737`	`+impl From<Dir> for OwnedHandle {`
`738`	`738`	`#[inline]`
`739`		`- fn into_handle(self) -> OwnedHandle {`
`740`		`- self.cap_std.into_handle()`
	`739`	`+ fn from(dir: Dir) -> OwnedHandle {`
	`740`	`+ dir.cap_std.into()`
`741`	`741`	`}`
`742`	`742`	`}`
`743`	`743`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ use cap_primitives::AmbientAuthority;`
`12`	`12`	`#[cfg(not(windows))]`
`13`	`13`	`use io_lifetimes::{AsFd, BorrowedFd, FromFd, IntoFd, OwnedFd};`
`14`	`14`	`#[cfg(windows)]`
`15`		`-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};`
	`15`	`+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};`
`16`	`16`	`use std::fmt;`
`17`	`17`	`use std::pin::Pin;`
`18`	`18`	`#[cfg(windows)]`
`@@ -176,10 +176,10 @@ impl FromRawHandle for File {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`#[cfg(windows)]`
`179`		`-impl FromHandle for File {`
	`179`	`+impl From<OwnedHandle> for File {`
`180`	`180`	`#[inline]`
`181`		`- fn from_handle(handle: OwnedHandle) -> Self {`
`182`		`- Self::from_std(fs::File::from_handle(handle))`
	`181`	`+ fn from(handle: OwnedHandle) -> Self {`
	`182`	`+ Self::from_std(fs::File::from(handle))`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`
`@@ -248,10 +248,10 @@ impl IntoRawHandle for File {`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`#[cfg(windows)]`
`251`		`-impl IntoHandle for File {`
	`251`	`+impl From<File> for OwnedHandle {`
`252`	`252`	`#[inline]`
`253`		`- fn into_handle(self) -> OwnedHandle {`
`254`		`- self.cap_std.into_handle()`
	`253`	`+ fn from(file: File) -> OwnedHandle {`
	`254`	`+ file.cap_std.into()`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ use async_std::{io, net};`
`5`	`5`	`#[cfg(not(windows))]`
`6`	`6`	`use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};`
`7`	`7`	`#[cfg(windows)]`
`8`		`-use io_lifetimes::{AsSocket, BorrowedSocket, FromSocket, IntoSocket, OwnedSocket};`
	`8`	`+use io_lifetimes::{AsSocket, BorrowedSocket, OwnedSocket};`
`9`	`9`	`use std::fmt;`
`10`	`10`	`#[cfg(windows)]`
`11`	`11`	`use {`
`@@ -103,10 +103,10 @@ impl FromRawSocket for TcpListener {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`#[cfg(windows)]`
`106`		`-impl FromSocket for TcpListener {`
	`106`	`+impl From<OwnedSocket> for TcpListener {`
`107`	`107`	`#[inline]`
`108`		`- fn from_socket(socket: OwnedSocket) -> Self {`
`109`		`- Self::from_std(net::TcpListener::from_socket(socket))`
	`108`	`+ fn from(socket: OwnedSocket) -> Self {`
	`109`	`+ Self::from_std(net::TcpListener::from(socket))`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`@@ -175,10 +175,10 @@ impl IntoRawSocket for TcpListener {`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`#[cfg(windows)]`
`178`		`-impl IntoSocket for TcpListener {`
	`178`	`+impl From<TcpListener> for OwnedSocket {`
`179`	`179`	`#[inline]`
`180`		`- fn into_socket(self) -> OwnedSocket {`
`181`		`- self.std.into_socket()`
	`180`	`+ fn from(listener: TcpListener) -> OwnedSocket {`
	`181`	`+ listener.std.into()`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use async_std::task::{Context, Poll};`
`7`	`7`	`#[cfg(not(windows))]`
`8`	`8`	`use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};`
`9`	`9`	`#[cfg(windows)]`
`10`		`-use io_lifetimes::{AsSocket, BorrowedSocket, FromSocket, IntoSocket, OwnedSocket};`
	`10`	`+use io_lifetimes::{AsSocket, BorrowedSocket, OwnedSocket};`
`11`	`11`	`use std::fmt;`
`12`	`12`	`use std::pin::Pin;`
`13`	`13`	`#[cfg(windows)]`
`@@ -147,10 +147,10 @@ impl FromRawSocket for TcpStream {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`#[cfg(windows)]`
`150`		`-impl FromSocket for TcpStream {`
	`150`	`+impl From<OwnedSocket> for TcpStream {`
`151`	`151`	`#[inline]`
`152`		`- fn from_socket(socket: OwnedSocket) -> Self {`
`153`		`- Self::from_std(net::TcpStream::from_socket(socket))`
	`152`	`+ fn from(socket: OwnedSocket) -> Self {`
	`153`	`+ Self::from_std(net::TcpStream::from(socket))`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`@@ -219,10 +219,10 @@ impl IntoRawSocket for TcpStream {`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`#[cfg(windows)]`
`222`		`-impl IntoSocket for TcpStream {`
	`222`	`+impl From<TcpStream> for OwnedSocket {`
`223`	`223`	`#[inline]`
`224`		`- fn into_socket(self) -> OwnedSocket {`
`225`		`- self.std.into_socket()`
	`224`	`+ fn from(stream: TcpStream) -> OwnedSocket {`
	`225`	`+ stream.std.into()`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ use io_lifetimes::AsFilelike;`
`13`	`13`	`#[cfg(not(windows))]`
`14`	`14`	`use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};`
`15`	`15`	`#[cfg(windows)]`
`16`		`-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};`
	`16`	`+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};`
`17`	`17`	`#[cfg(target_os = "wasi")]`
`18`	`18`	`use rustix::fs::OpenOptionsExt;`
`19`	`19`	`use std::io::{self, Read, Write};`
`@@ -709,10 +709,10 @@ impl FromRawHandle for Dir {`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`#[cfg(windows)]`
`712`		`-impl FromHandle for Dir {`
	`712`	`+impl From<OwnedHandle> for Dir {`
`713`	`713`	`#[inline]`
`714`		`- fn from_handle(handle: OwnedHandle) -> Self {`
`715`		`- Self::from_std_file(fs::File::from_handle(handle))`
	`714`	`+ fn from(handle: OwnedHandle) -> Self {`
	`715`	`+ Self::from_std_file(fs::File::from(handle))`
`716`	`716`	`}`
`717`	`717`	`}`
`718`	`718`
`@@ -781,10 +781,10 @@ impl IntoRawHandle for Dir {`
`781`	`781`	`}`
`782`	`782`
`783`	`783`	`#[cfg(windows)]`
`784`		`-impl IntoHandle for Dir {`
	`784`	`+impl From<Dir> for OwnedHandle {`
`785`	`785`	`#[inline]`
`786`		`- fn into_handle(self) -> OwnedHandle {`
`787`		`- self.std_file.into_handle()`
	`786`	`+ fn from(dir: Dir) -> OwnedHandle {`
	`787`	`+ dir.std_file.into()`
`788`	`788`	`}`
`789`	`789`	`}`
`790`	`790`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ use io_extras::os::rustix::{AsRawFd, FromRawFd, IntoRawFd, RawFd};`
`9`	`9`	`#[cfg(not(windows))]`
`10`	`10`	`use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};`
`11`	`11`	`#[cfg(windows)]`
`12`		`-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};`
	`12`	`+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};`
`13`	`13`	`use std::{fmt, fs, io};`
`14`	`14`	`#[cfg(windows)]`
`15`	`15`	`use {`
`@@ -646,12 +646,12 @@ impl FromRawHandle for Dir {`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`#[cfg(windows)]`
`649`		`-impl FromHandle for Dir {`
	`649`	`+impl From<OwnedHandle> for Dir {`
`650`	`650`	`/// To prevent race conditions on Windows, the handle must be opened`
`651`	`651`	/// without `FILE_SHARE_DELETE`.
`652`	`652`	`#[inline]`
`653`		`- fn from_handle(handle: OwnedHandle) -> Self {`
`654`		`- Self::from_std_file(fs::File::from_handle(handle))`
	`653`	`+ fn from(handle: OwnedHandle) -> Self {`
	`654`	`+ Self::from_std_file(fs::File::from(handle))`
`655`	`655`	`}`
`656`	`656`	`}`
`657`	`657`
`@@ -720,10 +720,10 @@ impl IntoRawHandle for Dir {`
`720`	`720`	`}`
`721`	`721`
`722`	`722`	`#[cfg(windows)]`
`723`		`-impl IntoHandle for Dir {`
	`723`	`+impl From<Dir> for OwnedHandle {`
`724`	`724`	`#[inline]`
`725`		`- fn into_handle(self) -> OwnedHandle {`
`726`		`- self.cap_std.into_handle()`
	`725`	`+ fn from(dir: Dir) -> OwnedHandle {`
	`726`	`+ dir.cap_std.into()`
`727`	`727`	`}`
`728`	`728`	`}`
`729`	`729`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use io_extras::os::rustix::{AsRawFd, FromRawFd, IntoRawFd, RawFd};`
`7`	`7`	`#[cfg(not(windows))]`
`8`	`8`	`use io_lifetimes::{AsFd, BorrowedFd, OwnedFd};`
`9`	`9`	`#[cfg(windows)]`
`10`		`-use io_lifetimes::{AsHandle, BorrowedHandle, FromHandle, IntoHandle, OwnedHandle};`
	`10`	`+use io_lifetimes::{AsHandle, BorrowedHandle, OwnedHandle};`
`11`	`11`	`use std::io::{self, IoSlice, IoSliceMut, Read, Seek, SeekFrom, Write};`
`12`	`12`	`#[cfg(target_os = "wasi")]`
`13`	`13`	`use std::path::Path;`
`@@ -182,10 +182,10 @@ impl FromRawHandle for File {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`#[cfg(windows)]`
`185`		`-impl FromHandle for File {`
	`185`	`+impl From<OwnedHandle> for File {`
`186`	`186`	`#[inline]`
`187`		`- fn from_handle(handle: OwnedHandle) -> Self {`
`188`		`- Self::from_std(fs::File::from_handle(handle))`
	`187`	`+ fn from(handle: OwnedHandle) -> Self {`
	`188`	`+ Self::from_std(fs::File::from(handle))`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`@@ -254,10 +254,10 @@ impl IntoRawHandle for File {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`#[cfg(windows)]`
`257`		`-impl IntoHandle for File {`
	`257`	`+impl From<File> for OwnedHandle {`
`258`	`258`	`#[inline]`
`259`		`- fn into_handle(self) -> OwnedHandle {`
`260`		`- self.cap_std.into_handle()`
	`259`	`+ fn from(file: File) -> OwnedHandle {`
	`260`	`+ file.cap_std.into()`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`