rt: Refactor `Runtime::block_on` to take `&self` (#2782)

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

1 files changed, 22 insertions, 24 deletions

diff --git a/tokio/src/runtime/enter.rs b/tokio/src/runtime/enter.rs
index 56a7c57b..bb6e6be0 100644
--- a/tokio/src/runtime/enter.rs
+++ b/tokio/src/runtime/enter.rs
@@ -138,31 +138,29 @@ cfg_rt_threaded! {
     }
 }
 
-cfg_block_on! {
-    impl Enter {
-        /// Blocks the thread on the specified future, returning the value with
-        /// which that future completes.
-        pub(crate) fn block_on<F>(&mut self, f: F) -> Result<F::Output, crate::park::ParkError>
-        where
-            F: std::future::Future,
-        {
-            use crate::park::{CachedParkThread, Park};
-            use std::task::Context;
-            use std::task::Poll::Ready;
-
-            let mut park = CachedParkThread::new();
-            let waker = park.get_unpark()?.into_waker();
-            let mut cx = Context::from_waker(&waker);
-
-            pin!(f);
-
-            loop {
-                if let Ready(v) = crate::coop::budget(|| f.as_mut().poll(&mut cx)) {
-                    return Ok(v);
-                }
-
-                park.park()?;
+impl Enter {
+    /// Blocks the thread on the specified future, returning the value with
+    /// which that future completes.
+    pub(crate) fn block_on<F>(&mut self, f: F) -> Result<F::Output, crate::park::ParkError>
+    where
+        F: std::future::Future,
+    {
+        use crate::park::{CachedParkThread, Park};
+        use std::task::Context;
+        use std::task::Poll::Ready;
+
+        let mut park = CachedParkThread::new();
+        let waker = park.get_unpark()?.into_waker();
+        let mut cx = Context::from_waker(&waker);
+
+        pin!(f);
+
+        loop {
+            if let Ready(v) = crate::coop::budget(|| f.as_mut().poll(&mut cx)) {
+                return Ok(v);
             }
+
+            park.park()?;
         }
     }
 }