net: use std::future::ready instead of own Ready future

tokio-rs · Nov 23, 2021 · 61da7ed · 61da7ed
1 parent cf32068
commit 61da7ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 37 deletions.
diff --git a/tokio/src/future/mod.rs b/tokio/src/future/mod.rs
@@ -8,11 +8,6 @@ pub(crate) mod maybe_done;
 mod poll_fn;
 pub use poll_fn::poll_fn;
 
-cfg_not_loom! {
-    mod ready;
-    pub(crate) use ready::{ok, Ready};
-}
-
 cfg_process! {
     mod try_join;
     pub(crate) use try_join::try_join3;

diff --git a/tokio/src/future/ready.rs b/tokio/src/future/ready.rs
diff --git a/tokio/src/net/addr.rs b/tokio/src/net/addr.rs
@@ -1,5 +1,4 @@
-use crate::future;
-
+use std::future;
 use std::io;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 
@@ -56,7 +55,7 @@ impl sealed::ToSocketAddrsPriv for SocketAddr {
 
     fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
         let iter = Some(*self).into_iter();
-        future::ok(iter)
+        future::ready(Ok(iter))
     }
 }
 
@@ -96,7 +95,7 @@ impl sealed::ToSocketAddrsPriv for (IpAddr, u16) {
 
     fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
         let iter = Some(SocketAddr::from(*self)).into_iter();
-        future::ok(iter)
+        future::ready(Ok(iter))
     }
 }
 
@@ -138,7 +137,7 @@ impl sealed::ToSocketAddrsPriv for &[SocketAddr] {
 
     fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
         let iter = self.to_vec().into_iter();
-        future::ok(iter)
+        future::ready(Ok(iter))
     }
 }