Removed unused tokio_* cfgs

- tokio_no_const_thread_local - tokio_no_target_has_atomic - tokio_no_as_fd Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
tokio-rs · Jul 28, 2023 · 32d8d57 · 32d8d57
1 parent 6aca07b
commit 32d8d57
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 139 deletions.
diff --git a/tokio/src/fs/file.rs b/tokio/src/fs/file.rs
@@ -758,7 +758,7 @@ impl std::os::unix::io::AsRawFd for File {
  }
 }
 
-#[cfg(all(unix, not(tokio_no_as_fd)))]
+#[cfg(unix)]
 impl std::os::unix::io::AsFd for File {
  fn as_fd(&self) -> std::os::unix::io::BorrowedFd<'_> {
  unsafe {
@@ -775,17 +775,14 @@ impl std::os::unix::io::FromRawFd for File {
 }
 
 cfg_windows! {
- use crate::os::windows::io::{AsRawHandle, FromRawHandle, RawHandle};
- #[cfg(not(tokio_no_as_fd))]
- use crate::os::windows::io::{AsHandle, BorrowedHandle};
+ use crate::os::windows::io::{AsRawHandle, FromRawHandle, RawHandle, AsHandle, BorrowedHandle};
 
  impl AsRawHandle for File {
  fn as_raw_handle(&self) -> RawHandle {
  self.std.as_raw_handle()
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsHandle for File {
  fn as_handle(&self) -> BorrowedHandle<'_> {
  unsafe {

diff --git a/tokio/src/io/async_fd.rs b/tokio/src/io/async_fd.rs
@@ -797,7 +797,6 @@ impl<T: AsRawFd> AsRawFd for AsyncFd<T> {
  }
 }
 
-#[cfg(not(tokio_no_as_fd))]
 impl<T: AsRawFd> std::os::unix::io::AsFd for AsyncFd<T> {
  fn as_fd(&self) -> std::os::unix::io::BorrowedFd<'_> {
  unsafe { std::os::unix::io::BorrowedFd::borrow_raw(self.as_raw_fd()) }

diff --git a/tokio/src/io/stderr.rs b/tokio/src/io/stderr.rs
@@ -75,9 +75,7 @@ cfg_io_std! {
 
 #[cfg(unix)]
 mod sys {
- #[cfg(not(tokio_no_as_fd))]
- use std::os::unix::io::{AsFd, BorrowedFd};
- use std::os::unix::io::{AsRawFd, RawFd};
+ use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
 
  use super::Stderr;
 
@@ -87,7 +85,6 @@ mod sys {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsFd for Stderr {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
@@ -96,17 +93,14 @@ mod sys {
 }
 
 cfg_windows! {
- #[cfg(not(tokio_no_as_fd))]
- use crate::os::windows::io::{AsHandle, BorrowedHandle};
- use crate::os::windows::io::{AsRawHandle, RawHandle};
+ use crate::os::windows::io::{AsHandle, BorrowedHandle, AsRawHandle, RawHandle};
 
  impl AsRawHandle for Stderr {
  fn as_raw_handle(&self) -> RawHandle {
  std::io::stderr().as_raw_handle()
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsHandle for Stderr {
  fn as_handle(&self) -> BorrowedHandle<'_> {
  unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }

diff --git a/tokio/src/io/stdin.rs b/tokio/src/io/stdin.rs
@@ -50,9 +50,7 @@ cfg_io_std! {
 
 #[cfg(unix)]
 mod sys {
- #[cfg(not(tokio_no_as_fd))]
- use std::os::unix::io::{AsFd, BorrowedFd};
- use std::os::unix::io::{AsRawFd, RawFd};
+ use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
 
  use super::Stdin;
 
@@ -62,7 +60,6 @@ mod sys {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsFd for Stdin {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
@@ -71,17 +68,14 @@ mod sys {
 }
 
 cfg_windows! {
- #[cfg(not(tokio_no_as_fd))]
- use crate::os::windows::io::{AsHandle, BorrowedHandle};
- use crate::os::windows::io::{AsRawHandle, RawHandle};
+ use crate::os::windows::io::{AsHandle, BorrowedHandle, AsRawHandle, RawHandle};
 
  impl AsRawHandle for Stdin {
  fn as_raw_handle(&self) -> RawHandle {
  std::io::stdin().as_raw_handle()
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsHandle for Stdin {
  fn as_handle(&self) -> BorrowedHandle<'_> {
  unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }

diff --git a/tokio/src/io/stdout.rs b/tokio/src/io/stdout.rs
@@ -74,9 +74,7 @@ cfg_io_std! {
 
 #[cfg(unix)]
 mod sys {
- #[cfg(not(tokio_no_as_fd))]
- use std::os::unix::io::{AsFd, BorrowedFd};
- use std::os::unix::io::{AsRawFd, RawFd};
+ use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
 
  use super::Stdout;
 
@@ -86,7 +84,6 @@ mod sys {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsFd for Stdout {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
@@ -95,17 +92,14 @@ mod sys {
 }
 
 cfg_windows! {
- #[cfg(not(tokio_no_as_fd))]
- use crate::os::windows::io::{AsHandle, BorrowedHandle};
- use crate::os::windows::io::{AsRawHandle, RawHandle};
+ use crate::os::windows::io::{AsHandle, BorrowedHandle, AsRawHandle, RawHandle};
 
  impl AsRawHandle for Stdout {
  fn as_raw_handle(&self) -> RawHandle {
  std::io::stdout().as_raw_handle()
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsHandle for Stdout {
  fn as_handle(&self) -> BorrowedHandle<'_> {
  unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }

diff --git a/tokio/src/macros/cfg.rs b/tokio/src/macros/cfg.rs
@@ -523,14 +523,7 @@ macro_rules! cfg_not_coop {
 macro_rules! cfg_has_atomic_u64 {
  ($($item:item)*) => {
  $(
- #[cfg_attr(
- not(tokio_no_target_has_atomic),
- cfg(all(target_has_atomic = "64", not(tokio_no_atomic_u64))
- ))]
- #[cfg_attr(
- tokio_no_target_has_atomic,
- cfg(not(tokio_no_atomic_u64))
- )]
+ #[cfg(all(target_has_atomic = "64", not(tokio_no_atomic_u64)))]
  $item
  )*
  }
@@ -539,14 +532,7 @@ macro_rules! cfg_has_atomic_u64 {
 macro_rules! cfg_not_has_atomic_u64 {
  ($($item:item)*) => {
  $(
- #[cfg_attr(
- not(tokio_no_target_has_atomic),
- cfg(any(not(target_has_atomic = "64"), tokio_no_atomic_u64)
- ))]
- #[cfg_attr(
- tokio_no_target_has_atomic,
- cfg(tokio_no_atomic_u64)
- )]
+ #[cfg(any(not(target_has_atomic = "64"), tokio_no_atomic_u64))]
  $item
  )*
  }

diff --git a/tokio/src/macros/thread_local.rs b/tokio/src/macros/thread_local.rs
@@ -10,23 +10,9 @@ macro_rules! tokio_thread_local {
  ($($tts:tt)+) => { loom::thread_local!{ $($tts)+ } }
 }
 
-#[cfg(not(tokio_no_const_thread_local))]
 #[cfg(not(all(loom, test)))]
 macro_rules! tokio_thread_local {
  ($($tts:tt)+) => {
  ::std::thread_local!{ $($tts)+ }
  }
 }
-
-#[cfg(tokio_no_const_thread_local)]
-#[cfg(not(all(loom, test)))]
-macro_rules! tokio_thread_local {
- ($(#[$attrs:meta])* $vis:vis static $name:ident: $ty:ty = const { $expr:expr } $(;)?) => {
- ::std::thread_local! {
- $(#[$attrs])*
- $vis static $name: $ty = $expr;
- }
- };
-
- ($($tts:tt)+) => { ::std::thread_local!{ $($tts)+ } }
-}
diff --git a/tokio/src/net/tcp/listener.rs b/tokio/src/net/tcp/listener.rs
@@ -407,7 +407,6 @@ mod sys {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsFd for TcpListener {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
@@ -427,7 +426,6 @@ cfg_unstable! {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsFd for TcpListener {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
@@ -437,17 +435,14 @@ cfg_unstable! {
 }
 
 cfg_windows! {
- use crate::os::windows::io::{AsRawSocket, RawSocket};
- #[cfg(not(tokio_no_as_fd))]
- use crate::os::windows::io::{AsSocket, BorrowedSocket};
+ use crate::os::windows::io::{AsRawSocket, RawSocket, AsSocket, BorrowedSocket};
 
  impl AsRawSocket for TcpListener {
  fn as_raw_socket(&self) -> RawSocket {
  self.io.as_raw_socket()
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsSocket for TcpListener {
  fn as_socket(&self) -> BorrowedSocket<'_> {
  unsafe { BorrowedSocket::borrow_raw(self.as_raw_socket()) }

diff --git a/tokio/src/net/tcp/socket.rs b/tokio/src/net/tcp/socket.rs
@@ -4,16 +4,12 @@ use std::fmt;
 use std::io;
 use std::net::SocketAddr;
 
-#[cfg(all(unix, not(tokio_no_as_fd)))]
-use std::os::unix::io::{AsFd, BorrowedFd};
 #[cfg(unix)]
-use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, RawFd};
 use std::time::Duration;
 
 cfg_windows! {
- use crate::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
- #[cfg(not(tokio_no_as_fd))]
- use crate::os::windows::io::{AsSocket, BorrowedSocket};
+ use crate::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket, AsSocket, BorrowedSocket};
 }
 
 cfg_net! {
@@ -788,7 +784,7 @@ impl AsRawFd for TcpSocket {
  }
 }
 
-#[cfg(all(unix, not(tokio_no_as_fd)))]
+#[cfg(unix)]
 impl AsFd for TcpSocket {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
@@ -829,7 +825,6 @@ cfg_windows! {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsSocket for TcpSocket {
  fn as_socket(&self) -> BorrowedSocket<'_> {
  unsafe { BorrowedSocket::borrow_raw(self.as_raw_socket()) }

diff --git a/tokio/src/net/tcp/stream.rs b/tokio/src/net/tcp/stream.rs
@@ -1378,7 +1378,6 @@ mod sys {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsFd for TcpStream {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
@@ -1387,17 +1386,14 @@ mod sys {
 }
 
 cfg_windows! {
- use crate::os::windows::io::{AsRawSocket, RawSocket};
- #[cfg(not(tokio_no_as_fd))]
- use crate::os::windows::io::{AsSocket, BorrowedSocket};
+ use crate::os::windows::io::{AsRawSocket, RawSocket, AsSocket, BorrowedSocket};
 
  impl AsRawSocket for TcpStream {
  fn as_raw_socket(&self) -> RawSocket {
  self.io.as_raw_socket()
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsSocket for TcpStream {
  fn as_socket(&self) -> BorrowedSocket<'_> {
  unsafe { BorrowedSocket::borrow_raw(self.as_raw_socket()) }
@@ -1416,7 +1412,6 @@ mod sys {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsFd for TcpStream {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }

diff --git a/tokio/src/net/udp.rs b/tokio/src/net/udp.rs
@@ -2021,7 +2021,6 @@ mod sys {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsFd for UdpSocket {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }
@@ -2031,7 +2030,6 @@ mod sys {
 
 cfg_windows! {
  use crate::os::windows::io::{AsRawSocket, RawSocket};
- #[cfg(not(tokio_no_as_fd))]
  use crate::os::windows::io::{AsSocket, BorrowedSocket};
 
  impl AsRawSocket for UdpSocket {
@@ -2040,7 +2038,6 @@ cfg_windows! {
  }
  }
 
- #[cfg(not(tokio_no_as_fd))]
  impl AsSocket for UdpSocket {
  fn as_socket(&self) -> BorrowedSocket<'_> {
  unsafe { BorrowedSocket::borrow_raw(self.as_raw_socket()) }

diff --git a/tokio/src/net/unix/datagram/socket.rs b/tokio/src/net/unix/datagram/socket.rs
@@ -4,9 +4,7 @@ use crate::net::unix::SocketAddr;
 use std::fmt;
 use std::io;
 use std::net::Shutdown;
-#[cfg(not(tokio_no_as_fd))]
-use std::os::unix::io::{AsFd, BorrowedFd};
-use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, RawFd};
 use std::os::unix::net;
 use std::path::Path;
 use std::task::{Context, Poll};
@@ -1578,7 +1576,6 @@ impl AsRawFd for UnixDatagram {
  }
 }
 
-#[cfg(not(tokio_no_as_fd))]
 impl AsFd for UnixDatagram {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }

diff --git a/tokio/src/net/unix/listener.rs b/tokio/src/net/unix/listener.rs
@@ -3,9 +3,7 @@ use crate::net::unix::{SocketAddr, UnixStream};
 
 use std::fmt;
 use std::io;
-#[cfg(not(tokio_no_as_fd))]
-use std::os::unix::io::{AsFd, BorrowedFd};
-use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, RawFd};
 use std::os::unix::net;
 use std::path::Path;
 use std::task::{Context, Poll};
@@ -211,7 +209,6 @@ impl AsRawFd for UnixListener {
  }
 }
 
-#[cfg(not(tokio_no_as_fd))]
 impl AsFd for UnixListener {
  fn as_fd(&self) -> BorrowedFd<'_> {
  unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) }