Fix compilation errors with `feature = io_safety`.

Fix a typo of "io-safety" in place of "io_safety", and fix various
compilation errors exposed by this fix.
pull/1084/head
Dan Gohman 4 months ago
parent 74dbd3a829
commit 590386a388

@ -461,7 +461,7 @@ cfg_unix! {
impl From<File> for OwnedFd { impl From<File> for OwnedFd {
fn from(val: File) -> OwnedFd { fn from(val: File) -> OwnedFd {
self.into_std_file().into() val.into_std_file().into()
} }
} }
} }

@ -186,7 +186,9 @@ cfg_unix! {
impl AsFd for Stderr { impl AsFd for Stderr {
fn as_fd(&self) -> BorrowedFd<'_> { fn as_fd(&self) -> BorrowedFd<'_> {
std::io::stderr().as_fd() unsafe {
BorrowedFd::borrow_raw(std::io::stderr().as_raw_fd())
}
} }
} }
} }

@ -210,9 +210,11 @@ cfg_unix! {
cfg_io_safety! { cfg_io_safety! {
use crate::os::unix::io::{AsFd, BorrowedFd}; use crate::os::unix::io::{AsFd, BorrowedFd};
impl AsFd for Stderr { impl AsFd for Stdin {
fn as_fd(&self) -> BorrowedFd<'_> { fn as_fd(&self) -> BorrowedFd<'_> {
std::io::stdin().as_fd() unsafe {
BorrowedFd::borrow_raw(std::io::stdin().as_raw_fd())
}
} }
} }
} }

@ -186,7 +186,9 @@ cfg_unix! {
impl AsFd for Stdout { impl AsFd for Stdout {
fn as_fd(&self) -> BorrowedFd<'_> { fn as_fd(&self) -> BorrowedFd<'_> {
std::io::stdout().as_fd() unsafe {
BorrowedFd::borrow_raw(std::io::stdout().as_raw_fd())
}
} }
} }
} }

@ -434,7 +434,7 @@ cfg_unix! {
impl From<TcpStream> for OwnedFd { impl From<TcpStream> for OwnedFd {
fn from(stream: TcpStream) -> OwnedFd { fn from(stream: TcpStream) -> OwnedFd {
stream.watcher.into_inner().unwrap().into() stream.watcher.get_ref().try_clone().unwrap().into()
} }
} }
} }

@ -574,7 +574,7 @@ cfg_unix! {
impl From<OwnedFd> for UdpSocket { impl From<OwnedFd> for UdpSocket {
fn from(fd: OwnedFd) -> UdpSocket { fn from(fd: OwnedFd) -> UdpSocket {
std::net::TcpStream::from(fd).into() std::net::UdpSocket::from(fd).into()
} }
} }

@ -352,7 +352,7 @@ cfg_io_safety! {
impl From<OwnedFd> for UnixDatagram { impl From<OwnedFd> for UnixDatagram {
fn from(fd: OwnedFd) -> UnixDatagram { fn from(fd: OwnedFd) -> UnixDatagram {
std::net::TcpStream::from(fd).into() StdUnixDatagram::from(fd).into()
} }
} }
@ -361,4 +361,4 @@ cfg_io_safety! {
stream.watcher.into_inner().unwrap().into() stream.watcher.into_inner().unwrap().into()
} }
} }
} }

@ -245,7 +245,7 @@ cfg_io_safety! {
impl From<OwnedFd> for UnixListener { impl From<OwnedFd> for UnixListener {
fn from(fd: OwnedFd) -> UnixListener { fn from(fd: OwnedFd) -> UnixListener {
std::net::TcpStream::from(fd).into() std::os::unix::net::UnixListener::from(fd).into()
} }
} }
@ -254,4 +254,4 @@ cfg_io_safety! {
stream.watcher.into_inner().unwrap().into() stream.watcher.into_inner().unwrap().into()
} }
} }
} }

@ -276,13 +276,13 @@ cfg_io_safety! {
impl From<OwnedFd> for UnixStream { impl From<OwnedFd> for UnixStream {
fn from(fd: OwnedFd) -> UnixStream { fn from(fd: OwnedFd) -> UnixStream {
std::net::TcpStream::from(fd).into() std::os::unix::net::UnixStream::from(fd).into()
} }
} }
impl From<UnixStream> for OwnedFd { impl From<UnixStream> for OwnedFd {
fn from(stream: UnixStream) -> OwnedFd { fn from(stream: UnixStream) -> OwnedFd {
stream.watcher.into_inner().unwrap().into() stream.watcher.get_ref().try_clone().unwrap().into()
} }
} }
} }

@ -246,7 +246,7 @@ macro_rules! cfg_default {
macro_rules! cfg_io_safety { macro_rules! cfg_io_safety {
($($item:item)*) => { ($($item:item)*) => {
$( $(
#[cfg(feature = "io-safety")] #[cfg(feature = "io_safety")]
$item $item
)* )*
} }

Loading…
Cancel
Save