rt: Remove `threaded_scheduler()` and `basic_scheduler()` (#2876)

Co-authored-by: Alice Ryhl <alice@ryhl.io>
Co-authored-by: Carl Lerche <me@carllerche.com>

1 files changed, 23 insertions, 22 deletions

diff --git a/tokio/src/net/addr.rs b/tokio/src/net/addr.rs
index 86b0962b..e2d09d47 100644
--- a/tokio/src/net/addr.rs
+++ b/tokio/src/net/addr.rs
@@ -153,22 +153,22 @@ cfg_dns! {
         type Future = sealed::MaybeReady;
 
         fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
-            use crate::runtime::spawn_blocking;
+            use crate::blocking::spawn_blocking;
             use sealed::MaybeReady;
 
             // First check if the input parses as a socket address
             let res: Result<SocketAddr, _> = self.parse();
 
             if let Ok(addr) = res {
-                return MaybeReady::Ready(Some(addr));
+                return MaybeReady(sealed::State::Ready(Some(addr)));
             }
 
             // Run DNS lookup on the blocking pool
             let s = self.to_owned();
 
-            MaybeReady::Blocking(spawn_blocking(move || {
+            MaybeReady(sealed::State::Blocking(spawn_blocking(move || {
                 std::net::ToSocketAddrs::to_socket_addrs(&s)
-            }))
+            })))
         }
     }
 
@@ -181,7 +181,7 @@ cfg_dns! {
         type Future = sealed::MaybeReady;
 
         fn to_socket_addrs(&self, _: sealed::Internal) -> Self::Future {
-            use crate::runtime::spawn_blocking;
+            use crate::blocking::spawn_blocking;
             use sealed::MaybeReady;
 
             let (host, port) = *self;
@@ -191,21 +191,21 @@ cfg_dns! {
                 let addr = SocketAddrV4::new(addr, port);
                 let addr = SocketAddr::V4(addr);
 
-                return MaybeReady::Ready(Some(addr));
+                return MaybeReady(sealed::State::Ready(Some(addr)));
             }
 
             if let Ok(addr) = host.parse::<Ipv6Addr>() {
                 let addr = SocketAddrV6::new(addr, port, 0, 0);
                 let addr = SocketAddr::V6(addr);
 
-                return MaybeReady::Ready(Some(addr));
+                return MaybeReady(sealed::State::Ready(Some(addr)));
             }
 
             let host = host.to_owned();
 
-            MaybeReady::Blocking(spawn_blocking(move || {
+            MaybeReady(sealed::State::Blocking(spawn_blocking(move || {
                 std::net::ToSocketAddrs::to_socket_addrs(&(&host[..], port))
-            }))
+            })))
         }
     }
 
@@ -245,15 +245,6 @@ pub(crate) mod sealed {
     use std::io;
     use std::net::SocketAddr;
 
-    cfg_dns! {
-        use crate::task::JoinHandle;
-
-        use std::option;
-        use std::pin::Pin;
-        use std::task::{Context, Poll};
-        use std::vec;
-    }
-
     #[doc(hidden)]
     pub trait ToSocketAddrsPriv {
         type Iter: Iterator<Item = SocketAddr> + Send + 'static;
@@ -266,9 +257,19 @@ pub(crate) mod sealed {
     pub struct Internal;
 
     cfg_dns! {
+        use crate::blocking::JoinHandle;
+
+        use std::option;
+        use std::pin::Pin;
+        use std::task::{Context, Poll};
+        use std::vec;
+
         #[doc(hidden)]
         #[derive(Debug)]
-        pub enum MaybeReady {
+        pub struct MaybeReady(pub(super) State);
+
+        #[derive(Debug)]
+        pub(super) enum State {
             Ready(Option<SocketAddr>),
             Blocking(JoinHandle<io::Result<vec::IntoIter<SocketAddr>>>),
         }
@@ -284,12 +285,12 @@ pub(crate) mod sealed {
             type Output = io::Result<OneOrMore>;
 
             fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-                match *self {
-                    MaybeReady::Ready(ref mut i) => {
+                match self.0 {
+                    State::Ready(ref mut i) => {
                         let iter = OneOrMore::One(i.take().into_iter());
                         Poll::Ready(Ok(iter))
                     }
-                    MaybeReady::Blocking(ref mut rx) => {
+                    State::Blocking(ref mut rx) => {
                         let res = ready!(Pin::new(rx).poll(cx))?.map(OneOrMore::More);
 
                         Poll::Ready(res)