Change AsFd::as_fd etc. from &self to self.

library/std/src/os/fd/owned.rs

@@ -177,7 +177,7 @@ impl fmt::Debug for OwnedFd {
 /// call the method. Windows platforms have a corresponding `AsHandle` and
 /// `AsSocket` set of traits.
 #[unstable(feature = "io_safety", issue = "87074")]
-pub trait AsFd {
+pub trait AsFd<'a> {
     /// Borrows the file descriptor.
     ///
     /// # Example
@@ -197,21 +197,21 @@ pub trait AsFd {
     /// # Ok::<(), io::Error>(())
     /// ```
     #[unstable(feature = "io_safety", issue = "87074")]
-    fn as_fd(&self) -> BorrowedFd<'_>;
+    fn as_fd(self) -> BorrowedFd<'a>;
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for BorrowedFd<'_> {
+impl<'a> AsFd<'a> for &'a BorrowedFd<'_> {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         *self
     }
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for OwnedFd {
+impl<'a> AsFd<'a> for &'a OwnedFd {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         // Safety: `OwnedFd` and `BorrowedFd` have the same validity
         // invariants, and the `BorrowdFd` is bounded by the lifetime
         // of `&self`.
@@ -220,9 +220,9 @@ impl AsFd for OwnedFd {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for fs::File {
+impl<'a> AsFd<'a> for &'a fs::File {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.as_inner().as_fd()
     }
 }
@@ -244,9 +244,9 @@ impl From<OwnedFd> for fs::File {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for crate::net::TcpStream {
+impl<'a> AsFd<'a> for &'a crate::net::TcpStream {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.as_inner().socket().as_fd()
     }
 }
@@ -270,9 +270,9 @@ impl From<OwnedFd> for crate::net::TcpStream {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for crate::net::TcpListener {
+impl<'a> AsFd<'a> for &'a crate::net::TcpListener {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.as_inner().socket().as_fd()
     }
 }
@@ -296,9 +296,9 @@ impl From<OwnedFd> for crate::net::TcpListener {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for crate::net::UdpSocket {
+impl<'a> AsFd<'a> for &'a crate::net::UdpSocket {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.as_inner().socket().as_fd()
     }
 }

library/std/src/os/linux/process.rs

@@ -87,8 +87,8 @@ impl IntoRawFd for PidFd {
     }
 }
 
-impl AsFd for PidFd {
-    fn as_fd(&self) -> BorrowedFd<'_> {
+impl<'a> AsFd<'a> for &'a PidFd {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.as_inner().as_fd()
     }
 }

library/std/src/os/unix/fs.rs

@@ -966,12 +966,12 @@ pub fn chown<P: AsRef<Path>>(dir: P, uid: Option<u32>, gid: Option<u32>) -> io::
 ///
 /// fn main() -> std::io::Result<()> {
 ///     let f = std::fs::File::open("/file")?;
-///     fs::fchown(f, Some(0), Some(0))?;
+///     fs::fchown(&f, Some(0), Some(0))?;
 ///     Ok(())
 /// }
 /// ```
 #[unstable(feature = "unix_chown", issue = "88989")]
-pub fn fchown<F: AsFd>(fd: F, uid: Option<u32>, gid: Option<u32>) -> io::Result<()> {
+pub fn fchown<'a, F: AsFd<'a>>(fd: F, uid: Option<u32>, gid: Option<u32>) -> io::Result<()> {
     sys::fs::fchown(fd.as_fd().as_raw_fd(), uid.unwrap_or(u32::MAX), gid.unwrap_or(u32::MAX))
 }
 

library/std/src/os/unix/net/datagram.rs

@@ -1008,9 +1008,9 @@ impl IntoRawFd for UnixDatagram {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for UnixDatagram {
+impl<'a> AsFd<'a> for &'a UnixDatagram {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.0.as_inner().as_fd()
     }
 }

library/std/src/os/unix/net/listener.rs

@@ -301,9 +301,9 @@ impl IntoRawFd for UnixListener {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for UnixListener {
+impl<'a> AsFd<'a> for &'a UnixListener {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.0.as_inner().as_fd()
     }
 }

library/std/src/os/unix/net/stream.rs

@@ -707,9 +707,9 @@ impl IntoRawFd for UnixStream {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for UnixStream {
+impl<'a> AsFd<'a> for &'a UnixStream {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.0.as_fd()
     }
 }

library/std/src/os/unix/process.rs

@@ -388,9 +388,9 @@ impl IntoRawFd for process::ChildStderr {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for crate::process::ChildStdin {
+impl<'a> AsFd<'a> for &'a crate::process::ChildStdin {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.as_inner().as_fd()
     }
 }
@@ -404,9 +404,9 @@ impl From<crate::process::ChildStdin> for OwnedFd {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for crate::process::ChildStdout {
+impl<'a> AsFd<'a> for &'a crate::process::ChildStdout {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.as_inner().as_fd()
     }
 }
@@ -420,9 +420,9 @@ impl From<crate::process::ChildStdout> for OwnedFd {
 }
 
 #[unstable(feature = "io_safety", issue = "87074")]
-impl AsFd for crate::process::ChildStderr {
+impl<'a> AsFd<'a> for &'a crate::process::ChildStderr {
     #[inline]
-    fn as_fd(&self) -> BorrowedFd<'_> {
+    fn as_fd(self) -> BorrowedFd<'a> {
         self.as_inner().as_fd()
     }
 }

library/std/src/os/windows/io/handle.rs

@@ -298,7 +298,7 @@ impl fmt::Debug for OwnedHandle {
 
 /// A trait to borrow the handle from an underlying object.
 #[unstable(feature = "io_safety", issue = "87074")]
-pub trait AsHandle {
+pub trait AsHandle<'a> {
     /// Borrows the handle.
     ///
     /// # Example
@@ -313,29 +313,29 @@ pub trait AsHandle {
     /// let borrowed_handle: BorrowedHandle<'_> = f.as_handle();
     /// # Ok::<(), io::Error>(())
     /// ```
-    fn as_handle(&self) -> BorrowedHandle<'_>;
+    fn as_handle(self) -> BorrowedHandle<'a>;
 }
 
-impl AsHandle for BorrowedHandle<'_> {
+impl<'a> AsHandle<'a> for &'a BorrowedHandle<'_> {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         *self
     }
 }
 
-impl AsHandle for OwnedHandle {
+impl<'a> AsHandle<'a> for &'a OwnedHandle {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         // Safety: `OwnedHandle` and `BorrowedHandle` have the same validity
         // invariants, and the `BorrowdHandle` is bounded by the lifetime
         // of `&self`.
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
 
-impl AsHandle for fs::File {
+impl<'a> AsHandle<'a> for &'a fs::File {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         self.as_inner().as_handle()
     }
 }
@@ -354,51 +354,51 @@ impl From<OwnedHandle> for fs::File {
     }
 }
 
-impl AsHandle for crate::io::Stdin {
+impl<'a> AsHandle<'a> for &'a crate::io::Stdin {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
 
-impl<'a> AsHandle for crate::io::StdinLock<'a> {
+impl<'a, 'b> AsHandle<'a> for &'a crate::io::StdinLock<'b> {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
 
-impl AsHandle for crate::io::Stdout {
+impl<'a> AsHandle<'a> for &'a crate::io::Stdout {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
 
-impl<'a> AsHandle for crate::io::StdoutLock<'a> {
+impl<'a, 'b> AsHandle<'a> for &'a crate::io::StdoutLock<'b> {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
 
-impl AsHandle for crate::io::Stderr {
+impl<'a> AsHandle<'a> for &'a crate::io::Stderr {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
 
-impl<'a> AsHandle for crate::io::StderrLock<'a> {
+impl<'a, 'b> AsHandle<'a> for &'a crate::io::StderrLock<'b> {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
 
-impl AsHandle for crate::process::ChildStdin {
+impl<'a> AsHandle<'a> for &'a crate::process::ChildStdin {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
@@ -410,9 +410,9 @@ impl From<crate::process::ChildStdin> for OwnedHandle {
     }
 }
 
-impl AsHandle for crate::process::ChildStdout {
+impl<'a> AsHandle<'a> for &'a crate::process::ChildStdout {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
@@ -424,9 +424,9 @@ impl From<crate::process::ChildStdout> for OwnedHandle {
     }
 }
 
-impl AsHandle for crate::process::ChildStderr {
+impl<'a> AsHandle<'a> for &'a crate::process::ChildStderr {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }
@@ -438,9 +438,9 @@ impl From<crate::process::ChildStderr> for OwnedHandle {
     }
 }
 
-impl<T> AsHandle for crate::thread::JoinHandle<T> {
+impl<'a, T> AsHandle<'a> for &'a crate::thread::JoinHandle<T> {
     #[inline]
-    fn as_handle(&self) -> BorrowedHandle<'_> {
+    fn as_handle(self) -> BorrowedHandle<'a> {
         unsafe { BorrowedHandle::borrow_raw_handle(self.as_raw_handle()) }
     }
 }

library/std/src/os/windows/io/socket.rs

@@ -205,31 +205,31 @@ impl fmt::Debug for OwnedSocket {
 
 /// A trait to borrow the socket from an underlying object.
 #[unstable(feature = "io_safety", issue = "87074")]
-pub trait AsSocket {
+pub trait AsSocket<'a> {
     /// Borrows the socket.
-    fn as_socket(&self) -> BorrowedSocket<'_>;
+    fn as_socket(self) -> BorrowedSocket<'a>;
 }
 
-impl AsSocket for BorrowedSocket<'_> {
+impl<'a> AsSocket<'a> for &'a BorrowedSocket<'_> {
     #[inline]
-    fn as_socket(&self) -> BorrowedSocket<'_> {
+    fn as_socket(self) -> BorrowedSocket<'a> {
         *self
     }
 }
 
-impl AsSocket for OwnedSocket {
+impl<'a> AsSocket<'a> for &'a OwnedSocket {
     #[inline]
-    fn as_socket(&self) -> BorrowedSocket<'_> {
+    fn as_socket(self) -> BorrowedSocket<'a> {
         // Safety: `OwnedSocket` and `BorrowedSocket` have the same validity
         // invariants, and the `BorrowdSocket` is bounded by the lifetime
         // of `&self`.
         unsafe { BorrowedSocket::borrow_raw_socket(self.as_raw_socket()) }
     }
 }
 
-impl AsSocket for crate::net::TcpStream {
+impl<'a> AsSocket<'a> for &'a crate::net::TcpStream {
     #[inline]
-    fn as_socket(&self) -> BorrowedSocket<'_> {
+    fn as_socket(self) -> BorrowedSocket<'a> {
         unsafe { BorrowedSocket::borrow_raw_socket(self.as_raw_socket()) }
     }
 }
@@ -248,9 +248,9 @@ impl From<OwnedSocket> for crate::net::TcpStream {
     }
 }
 
-impl AsSocket for crate::net::TcpListener {
+impl<'a> AsSocket<'a> for &'a crate::net::TcpListener {
     #[inline]
-    fn as_socket(&self) -> BorrowedSocket<'_> {
+    fn as_socket(self) -> BorrowedSocket<'a> {
         unsafe { BorrowedSocket::borrow_raw_socket(self.as_raw_socket()) }
     }
 }
@@ -269,9 +269,9 @@ impl From<OwnedSocket> for crate::net::TcpListener {
     }
 }
 
-impl AsSocket for crate::net::UdpSocket {
+impl<'a> AsSocket<'a> for &'a crate::net::UdpSocket {
     #[inline]
-    fn as_socket(&self) -> BorrowedSocket<'_> {
+    fn as_socket(self) -> BorrowedSocket<'a> {
         unsafe { BorrowedSocket::borrow_raw_socket(self.as_raw_socket()) }
     }
 }