diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 41323a3009..d5fa03e248 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -9,7 +9,7 @@ use deno_core::serde_json::json; use deno_core::serde_json::Value; use deno_core::ModuleSpecifier; use deno_graph::ModuleKind; -use deno_runtime::tokio_util::run_basic; +use deno_runtime::tokio_util::run_local; use import_map::ImportMap; use log::error; use log::warn; @@ -2822,7 +2822,7 @@ impl Inner { // todo(dsherret): why is running this on a new thread necessary? It does // a compile error otherwise. let handle = tokio::task::spawn_blocking(|| { - run_basic( + run_local( async move { create_graph_for_caching(cli_options, roots).await }, ) }); diff --git a/cli/lsp/testing/execution.rs b/cli/lsp/testing/execution.rs index 366eedd6de..d5c0f6278e 100644 --- a/cli/lsp/testing/execution.rs +++ b/cli/lsp/testing/execution.rs @@ -31,7 +31,7 @@ use deno_core::ModuleSpecifier; use deno_runtime::ops::io::Stdio; use deno_runtime::ops::io::StdioPipe; use deno_runtime::permissions::Permissions; -use deno_runtime::tokio_util::run_basic; +use deno_runtime::tokio_util::run_local; use std::collections::HashMap; use std::collections::HashSet; use std::sync::Arc; @@ -353,7 +353,7 @@ impl TestRun { tokio::task::spawn_blocking(move || { let origin = specifier.to_string(); - let file_result = run_basic(test_specifier( + let file_result = run_local(test_specifier( ps, permissions, specifier, diff --git a/cli/main.rs b/cli/main.rs index 18eb58ff51..c6188fec84 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -90,7 +90,7 @@ use deno_runtime::colors; use deno_runtime::ops::worker_host::CreateWebWorkerCb; use deno_runtime::ops::worker_host::PreloadModuleCb; use deno_runtime::permissions::Permissions; -use deno_runtime::tokio_util::run_basic; +use deno_runtime::tokio_util::run_local; use deno_runtime::web_worker::WebWorker; use deno_runtime::web_worker::WebWorkerOptions; use deno_runtime::worker::MainWorker; @@ -1392,7 +1392,7 @@ pub fn main() { exit_code }; - let exit_code = unwrap_or_exit(run_basic(exit_code)); + let exit_code = unwrap_or_exit(run_local(exit_code)); std::process::exit(exit_code); } diff --git a/cli/tools/bench.rs b/cli/tools/bench.rs index 3946435dfd..e859ef7866 100644 --- a/cli/tools/bench.rs +++ b/cli/tools/bench.rs @@ -28,7 +28,7 @@ use deno_core::futures::StreamExt; use deno_core::ModuleSpecifier; use deno_graph::ModuleKind; use deno_runtime::permissions::Permissions; -use deno_runtime::tokio_util::run_basic; +use deno_runtime::tokio_util::run_local; use indexmap::IndexMap; use log::Level; use serde::Deserialize; @@ -434,7 +434,7 @@ async fn bench_specifiers( tokio::task::spawn_blocking(move || { let future = bench_specifier(ps, permissions, specifier, sender, options); - run_basic(future) + run_local(future) }) }); diff --git a/cli/tools/test.rs b/cli/tools/test.rs index 5586026ccc..d5317a7610 100644 --- a/cli/tools/test.rs +++ b/cli/tools/test.rs @@ -39,7 +39,7 @@ use deno_graph::ModuleKind; use deno_runtime::ops::io::Stdio; use deno_runtime::ops::io::StdioPipe; use deno_runtime::permissions::Permissions; -use deno_runtime::tokio_util::run_basic; +use deno_runtime::tokio_util::run_local; use log::Level; use rand::rngs::SmallRng; use rand::seq::SliceRandom; @@ -1118,7 +1118,7 @@ async fn test_specifiers( tokio::task::spawn_blocking(move || { let origin = specifier.to_string(); - let file_result = run_basic(test_specifier( + let file_result = run_local(test_specifier( ps, permissions, specifier, diff --git a/runtime/tokio_util.rs b/runtime/tokio_util.rs index 25693ae552..52888abe45 100644 --- a/runtime/tokio_util.rs +++ b/runtime/tokio_util.rs @@ -14,8 +14,7 @@ pub fn create_basic_runtime() -> tokio::runtime::Runtime { .unwrap() } -// TODO(ry) rename to run_local ? -pub fn run_basic(future: F) -> R +pub fn run_local(future: F) -> R where F: std::future::Future, { diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index ba2c016cc9..83ba380a6f 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -5,7 +5,7 @@ use crate::js; use crate::ops; use crate::ops::io::Stdio; use crate::permissions::Permissions; -use crate::tokio_util::run_basic; +use crate::tokio_util::run_local; use crate::worker::FormatJsErrorFn; use crate::BootstrapOptions; use deno_broadcast_channel::InMemoryBroadcastChannel; @@ -733,5 +733,5 @@ pub fn run_web_worker( debug!("Worker thread shuts down {}", &name); result }; - run_basic(fut) + run_local(fut) }