remove sketchy intos

Author: estebank

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

@@ -2,7 +2,6 @@
 
 #![stable(feature = "io_safety", since = "1.63.0")]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![cfg_attr(not(bootstrap), allow(self_type_conversion))]
 use super::raw::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 use crate::marker::PhantomData;
 use crate::mem::ManuallyDrop;
@@ -329,7 +328,7 @@ impl From<crate::net::TcpStream> for OwnedFd {
     /// Takes ownership of a [`TcpStream`](crate::net::TcpStream)'s socket file descriptor.
     #[inline]
     fn from(tcp_stream: crate::net::TcpStream) -> OwnedFd {
-        tcp_stream.into_inner().into_socket().into_inner().into_inner().into()
+        tcp_stream.into_inner().into_socket().into_inner().into_inner()
     }
 }
 
@@ -356,7 +355,7 @@ impl From<crate::net::TcpListener> for OwnedFd {
     /// Takes ownership of a [`TcpListener`](crate::net::TcpListener)'s socket file descriptor.
     #[inline]
     fn from(tcp_listener: crate::net::TcpListener) -> OwnedFd {
-        tcp_listener.into_inner().into_socket().into_inner().into_inner().into()
+        tcp_listener.into_inner().into_socket().into_inner().into_inner()
     }
 }
 
@@ -383,7 +382,7 @@ impl From<crate::net::UdpSocket> for OwnedFd {
     /// Takes ownership of a [`UdpSocket`](crate::net::UdpSocket)'s file descriptor.
     #[inline]
     fn from(udp_socket: crate::net::UdpSocket) -> OwnedFd {
-        udp_socket.into_inner().into_socket().into_inner().into_inner().into()
+        udp_socket.into_inner().into_socket().into_inner().into_inner()
     }
 }
 

library/std/src/sys/pal/unix/process/process_unix.rs

@@ -285,7 +285,6 @@ impl Command {
     // have the drop glue anyway because this code never returns (the
     // child will either exec() or invoke libc::exit)
     #[cfg(not(any(target_os = "tvos", target_os = "watchos")))]
-    #[cfg_attr(not(bootstrap), allow(self_type_conversion))]
     unsafe fn do_exec(
         &mut self,
         stdio: ChildPipes,
@@ -329,7 +328,7 @@ impl Command {
                         // An alternative would be to require CAP_SETGID (in
                         // addition to CAP_SETUID) for setting the UID.
                         if e.raw_os_error() != Some(libc::EPERM) {
-                            return Err(e.into());
+                            return Err(e);
                         }
                     }
                 }

library/std/src/sys_common/process.rs

@@ -25,12 +25,11 @@ impl fmt::Debug for CommandEnv {
 
 impl CommandEnv {
     // Capture the current environment with these changes applied
-    #[cfg_attr(not(bootstrap), allow(self_type_conversion))]
     pub fn capture(&self) -> BTreeMap<EnvKey, OsString> {
         let mut result = BTreeMap::<EnvKey, OsString>::new();
         if !self.clear {
             for (k, v) in env::vars_os() {
-                result.insert(k.into(), v);
+                result.insert(k, v);
             }
         }
         for (k, maybe_v) in &self.vars {