rt: switch `enter` to an RAII guard (#2954)

3 files changed, 13 insertions, 28 deletions

diff --git a/tokio/tests/io_driver.rs b/tokio/tests/io_driver.rs
index 82fb1021..9a40247e 100644
--- a/tokio/tests/io_driver.rs
+++ b/tokio/tests/io_driver.rs
@@ -67,11 +67,10 @@ fn test_drop_on_notify() {
     }));
 
     {
-        rt.enter(|| {
-            let waker = waker_ref(&task);
-            let mut cx = Context::from_waker(&waker);
-            assert_pending!(task.future.lock().unwrap().as_mut().poll(&mut cx));
-        });
+        let _enter = rt.enter();
+        let waker = waker_ref(&task);
+        let mut cx = Context::from_waker(&waker);
+        assert_pending!(task.future.lock().unwrap().as_mut().poll(&mut cx));
     }
 
     // Get the address
diff --git a/tokio/tests/io_driver_drop.rs b/tokio/tests/io_driver_drop.rs
index 72c7ae25..631e66e9 100644
--- a/tokio/tests/io_driver_drop.rs
+++ b/tokio/tests/io_driver_drop.rs
@@ -9,10 +9,11 @@ use tokio_test::{assert_err, assert_pending, assert_ready, task};
 fn tcp_doesnt_block() {
     let rt = rt();
 
-    let listener = rt.enter(|| {
+    let listener = {
+        let _enter = rt.enter();
         let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
         TcpListener::from_std(listener).unwrap()
-    });
+    };
 
     drop(rt);
 
@@ -27,10 +28,11 @@ fn tcp_doesnt_block() {
 fn drop_wakes() {
     let rt = rt();
 
-    let listener = rt.enter(|| {
+    let listener = {
+        let _enter = rt.enter();
         let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
         TcpListener::from_std(listener).unwrap()
-    });
+    };
 
     let mut task = task::spawn(async move {
         assert_err!(listener.accept().await);
diff --git a/tokio/tests/rt_common.rs b/tokio/tests/rt_common.rs
index a4091616..74a94d5b 100644
--- a/tokio/tests/rt_common.rs
+++ b/tokio/tests/rt_common.rs
@@ -555,23 +555,6 @@ rt_test! {
     }
 
     #[test]
-    fn spawn_blocking_after_shutdown() {
-        let rt = rt();
-        let handle = rt.clone();
-
-        // Shutdown
-        drop(rt);
-
-        handle.enter(|| {
-            let res = task::spawn_blocking(|| unreachable!());
-
-            // Avoid using a tokio runtime
-            let out = futures::executor::block_on(res);
-            assert!(out.is_err());
-        });
-    }
-
-    #[test]
     fn always_active_parker() {
         // This test it to show that we will always have
         // an active parker even if we call block_on concurrently
@@ -713,9 +696,10 @@ rt_test! {
     #[test]
     fn enter_and_spawn() {
         let rt = rt();
-        let handle = rt.enter(|| {
+        let handle = {
+            let _enter = rt.enter();
             tokio::spawn(async {})
-        });
+        };
 
         assert_ok!(rt.block_on(handle));
     }