From efb7023b59d16322d117767a8581b79453c300da Mon Sep 17 00:00:00 2001
From: Nikhil Benesch <nikhil.benesch@gmail.com>
Date: Fri, 15 Jan 2021 15:48:20 -0500
Subject: [PATCH] testdrive: resolve a todo re: tokio::spawn::block_in_place

Spawning a new task is no longer necessary to use
tokio::spawn::block_in_place.
---
 src/testdrive/src/lib.rs | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/testdrive/src/lib.rs b/src/testdrive/src/lib.rs
index 76ba9cac45964..460961fa1c9ba 100644
--- a/src/testdrive/src/lib.rs
+++ b/src/testdrive/src/lib.rs
@@ -90,25 +90,18 @@ async fn run_line_reader(config: &Config, line_reader: &mut LineReader<'_>) -> R
         if config.reset_materialized {
             state.reset_materialized().await?;
         }
-        // The `tokio::spawn` allows using `block_in_place` to run sync code within
-        // the spawned task. The spawn will one day not be necessary.
-        // See: https://github.com/tokio-rs/tokio/issues/1838.
-        tokio::spawn(async move {
-            let actions = action::build(cmds_exec, &state)?;
-            for a in actions.iter().rev() {
-                let undo = a.action.undo(&mut state);
-                undo.await.map_err(|e| InputError { msg: e, pos: a.pos })?;
-            }
-            for a in &actions {
-                let redo = a.action.redo(&mut state);
-                redo.await.map_err(|e| InputError { msg: e, pos: a.pos })?;
-            }
-            state.reset_kinesis().await?;
-            drop(state);
-            state_cleanup.await
-        })
-        .await
-        .expect("action task unexpectedly canceled")?
+        let actions = action::build(cmds_exec, &state)?;
+        for a in actions.iter().rev() {
+            let undo = a.action.undo(&mut state);
+            undo.await.map_err(|e| InputError { msg: e, pos: a.pos })?;
+        }
+        for a in &actions {
+            let redo = a.action.redo(&mut state);
+            redo.await.map_err(|e| InputError { msg: e, pos: a.pos })?;
+        }
+        state.reset_kinesis().await?;
+        drop(state);
+        state_cleanup.await?;
     }
     Ok(())
 }