Skip to content

Commit c72bf7f

Browse files
committed
Support I/O Safety unconditionally
Declare an MSRV of Rust 1.63 (available in the imminently releasing Debian stable version), and use the types unconditionally.
1 parent 6ec079e commit c72bf7f

File tree

3 files changed

+8
-31
lines changed

3 files changed

+8
-31
lines changed

Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ slab = "0.4.2"
3636
socket2 = { version = "0.5.3", features = ["all"] }
3737
waker-fn = "1.1.0"
3838

39-
[build-dependencies]
40-
autocfg = "1"
41-
4239
[dev-dependencies]
4340
async-channel = "1"
4441
async-net = "1"

build.rs

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/lib.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,15 @@ use std::sync::Arc;
6464
use std::task::{Context, Poll, Waker};
6565
use std::time::{Duration, Instant};
6666

67-
#[cfg(all(not(async_io_no_io_safety), unix))]
68-
use std::os::unix::io::{AsFd, BorrowedFd, OwnedFd};
6967
#[cfg(unix)]
7068
use std::{
71-
os::unix::io::{AsRawFd, RawFd},
69+
os::unix::io::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd},
7270
os::unix::net::{SocketAddr as UnixSocketAddr, UnixDatagram, UnixListener, UnixStream},
7371
path::Path,
7472
};
7573

7674
#[cfg(windows)]
77-
use std::os::windows::io::{AsRawSocket, RawSocket};
78-
#[cfg(all(not(async_io_no_io_safety), windows))]
79-
use std::os::windows::io::{AsSocket, BorrowedSocket, OwnedSocket};
75+
use std::os::windows::io::{AsRawSocket, AsSocket, BorrowedSocket, OwnedSocket, RawSocket};
8076

8177
use futures_io::{AsyncRead, AsyncWrite};
8278
use futures_lite::stream::{self, Stream};
@@ -685,14 +681,14 @@ impl<T: AsRawFd> AsRawFd for Async<T> {
685681
}
686682
}
687683

688-
#[cfg(all(not(async_io_no_io_safety), unix))]
684+
#[cfg(unix)]
689685
impl<T: AsFd> AsFd for Async<T> {
690686
fn as_fd(&self) -> BorrowedFd<'_> {
691687
self.get_ref().as_fd()
692688
}
693689
}
694690

695-
#[cfg(all(not(async_io_no_io_safety), unix))]
691+
#[cfg(unix)]
696692
impl<T: AsRawFd + From<OwnedFd>> TryFrom<OwnedFd> for Async<T> {
697693
type Error = io::Error;
698694

@@ -701,7 +697,7 @@ impl<T: AsRawFd + From<OwnedFd>> TryFrom<OwnedFd> for Async<T> {
701697
}
702698
}
703699

704-
#[cfg(all(not(async_io_no_io_safety), unix))]
700+
#[cfg(unix)]
705701
impl<T: Into<OwnedFd>> TryFrom<Async<T>> for OwnedFd {
706702
type Error = io::Error;
707703

@@ -761,14 +757,14 @@ impl<T: AsRawSocket> AsRawSocket for Async<T> {
761757
}
762758
}
763759

764-
#[cfg(all(not(async_io_no_io_safety), windows))]
760+
#[cfg(windows)]
765761
impl<T: AsSocket> AsSocket for Async<T> {
766762
fn as_socket(&self) -> BorrowedSocket<'_> {
767763
self.get_ref().as_socket()
768764
}
769765
}
770766

771-
#[cfg(all(not(async_io_no_io_safety), windows))]
767+
#[cfg(windows)]
772768
impl<T: AsRawSocket + From<OwnedSocket>> TryFrom<OwnedSocket> for Async<T> {
773769
type Error = io::Error;
774770

@@ -777,7 +773,7 @@ impl<T: AsRawSocket + From<OwnedSocket>> TryFrom<OwnedSocket> for Async<T> {
777773
}
778774
}
779775

780-
#[cfg(all(not(async_io_no_io_safety), windows))]
776+
#[cfg(windows)]
781777
impl<T: Into<OwnedSocket>> TryFrom<Async<T>> for OwnedSocket {
782778
type Error = io::Error;
783779

0 commit comments

Comments
 (0)