Skip to content

Commit 090ee6b

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 46a0205 commit 090ee6b

File tree

3 files changed

+9
-29
lines changed

3 files changed

+9
-29
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name = "async-io"
66
version = "1.13.0"
77
authors = ["Stjepan Glavina <[email protected]>"]
88
edition = "2018"
9-
rust-version = "1.48"
9+
rust-version = "1.63"
1010
description = "Async I/O and timers"
1111
license = "Apache-2.0 OR MIT"
1212
repository = "https://github.com/smol-rs/async-io"

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};
@@ -691,14 +687,14 @@ impl<T: AsRawFd> AsRawFd for Async<T> {
691687
}
692688
}
693689

694-
#[cfg(all(not(async_io_no_io_safety), unix))]
690+
#[cfg(unix)]
695691
impl<T: AsFd> AsFd for Async<T> {
696692
fn as_fd(&self) -> BorrowedFd<'_> {
697693
self.get_ref().as_fd()
698694
}
699695
}
700696

701-
#[cfg(all(not(async_io_no_io_safety), unix))]
697+
#[cfg(unix)]
702698
impl<T: AsRawFd + From<OwnedFd>> TryFrom<OwnedFd> for Async<T> {
703699
type Error = io::Error;
704700

@@ -707,7 +703,7 @@ impl<T: AsRawFd + From<OwnedFd>> TryFrom<OwnedFd> for Async<T> {
707703
}
708704
}
709705

710-
#[cfg(all(not(async_io_no_io_safety), unix))]
706+
#[cfg(unix)]
711707
impl<T: Into<OwnedFd>> TryFrom<Async<T>> for OwnedFd {
712708
type Error = io::Error;
713709

@@ -767,14 +763,14 @@ impl<T: AsRawSocket> AsRawSocket for Async<T> {
767763
}
768764
}
769765

770-
#[cfg(all(not(async_io_no_io_safety), windows))]
766+
#[cfg(windows)]
771767
impl<T: AsSocket> AsSocket for Async<T> {
772768
fn as_socket(&self) -> BorrowedSocket<'_> {
773769
self.get_ref().as_socket()
774770
}
775771
}
776772

777-
#[cfg(all(not(async_io_no_io_safety), windows))]
773+
#[cfg(windows)]
778774
impl<T: AsRawSocket + From<OwnedSocket>> TryFrom<OwnedSocket> for Async<T> {
779775
type Error = io::Error;
780776

@@ -783,7 +779,7 @@ impl<T: AsRawSocket + From<OwnedSocket>> TryFrom<OwnedSocket> for Async<T> {
783779
}
784780
}
785781

786-
#[cfg(all(not(async_io_no_io_safety), windows))]
782+
#[cfg(windows)]
787783
impl<T: Into<OwnedSocket>> TryFrom<Async<T>> for OwnedSocket {
788784
type Error = io::Error;
789785

0 commit comments

Comments
 (0)