diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-03-11 23:48:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-11 23:48:00 -0400 |
commit | ad6b00a2bf061a90c72737d0ecc4a58bb0a89550 (patch) | |
tree | daf342fa1d0dcde202a116ac010f310ba4321fa9 /cli | |
parent | c38c14f51f2edc8d25f349de52fc1268b97b59b2 (diff) |
chore: enable clippy unused_async rule (#22834)
Diffstat (limited to 'cli')
-rw-r--r-- | cli/factory.rs | 13 | ||||
-rw-r--r-- | cli/lsp/code_lens.rs | 2 | ||||
-rw-r--r-- | cli/lsp/language_server.rs | 48 | ||||
-rw-r--r-- | cli/lsp/registries.rs | 2 | ||||
-rw-r--r-- | cli/lsp/testing/execution.rs | 2 | ||||
-rw-r--r-- | cli/lsp/tsc.rs | 6 | ||||
-rw-r--r-- | cli/main.rs | 10 | ||||
-rw-r--r-- | cli/tools/bench/mod.rs | 3 | ||||
-rw-r--r-- | cli/tools/bundle.rs | 9 | ||||
-rw-r--r-- | cli/tools/compile.rs | 2 | ||||
-rw-r--r-- | cli/tools/coverage/mod.rs | 2 | ||||
-rw-r--r-- | cli/tools/doc.rs | 7 | ||||
-rw-r--r-- | cli/tools/fmt.rs | 4 | ||||
-rw-r--r-- | cli/tools/info.rs | 2 | ||||
-rw-r--r-- | cli/tools/init/mod.rs | 2 | ||||
-rw-r--r-- | cli/tools/installer.rs | 3 | ||||
-rw-r--r-- | cli/tools/jupyter/mod.rs | 2 | ||||
-rw-r--r-- | cli/tools/lint/mod.rs | 4 | ||||
-rw-r--r-- | cli/tools/registry/mod.rs | 2 | ||||
-rw-r--r-- | cli/tools/registry/pm.rs | 2 | ||||
-rw-r--r-- | cli/tools/repl/mod.rs | 2 | ||||
-rw-r--r-- | cli/tools/repl/session.rs | 2 | ||||
-rw-r--r-- | cli/tools/run/mod.rs | 9 | ||||
-rw-r--r-- | cli/tools/task.rs | 2 | ||||
-rw-r--r-- | cli/tools/test/mod.rs | 5 | ||||
-rw-r--r-- | cli/tools/upgrade.rs | 2 | ||||
-rw-r--r-- | cli/worker.rs | 4 |
27 files changed, 70 insertions, 83 deletions
diff --git a/cli/factory.rs b/cli/factory.rs index fb4297045..a2755c129 100644 --- a/cli/factory.rs +++ b/cli/factory.rs @@ -83,20 +83,17 @@ impl CliFactoryBuilder { } } - pub async fn build_from_flags( - self, - flags: Flags, - ) -> Result<CliFactory, AnyError> { + pub fn build_from_flags(self, flags: Flags) -> Result<CliFactory, AnyError> { Ok(self.build_from_cli_options(Arc::new(CliOptions::from_flags(flags)?))) } - pub async fn build_from_flags_for_watcher( + pub fn build_from_flags_for_watcher( mut self, flags: Flags, watcher_communicator: Arc<WatcherCommunicator>, ) -> Result<CliFactory, AnyError> { self.watcher_communicator = Some(watcher_communicator); - self.build_from_flags(flags).await + self.build_from_flags(flags) } pub fn build_from_cli_options(self, options: Arc<CliOptions>) -> CliFactory { @@ -190,8 +187,8 @@ pub struct CliFactory { } impl CliFactory { - pub async fn from_flags(flags: Flags) -> Result<Self, AnyError> { - CliFactoryBuilder::new().build_from_flags(flags).await + pub fn from_flags(flags: Flags) -> Result<Self, AnyError> { + CliFactoryBuilder::new().build_from_flags(flags) } pub fn from_cli_options(options: Arc<CliOptions>) -> Self { diff --git a/cli/lsp/code_lens.rs b/cli/lsp/code_lens.rs index 59787dd84..8300546b4 100644 --- a/cli/lsp/code_lens.rs +++ b/cli/lsp/code_lens.rs @@ -415,7 +415,7 @@ pub fn collect_test( } /// Return tsc navigation tree code lenses. -pub async fn collect_tsc( +pub fn collect_tsc( specifier: &ModuleSpecifier, code_lens_settings: &CodeLensSettings, line_index: Arc<LineIndex>, diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 3555a0545..08bb37c7c 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -786,7 +786,7 @@ impl Inner { }) } - pub async fn update_cache(&mut self) -> Result<(), AnyError> { + pub fn update_cache(&mut self) -> Result<(), AnyError> { let mark = self.performance.mark("lsp.update_cache"); self.performance.measure(mark); let maybe_cache = &self.config.workspace_settings().cache; @@ -816,23 +816,17 @@ impl Inner { None }; if self.maybe_global_cache_path != maybe_global_cache_path { - self - .set_new_global_cache_path(maybe_global_cache_path) - .await?; + self.set_new_global_cache_path(maybe_global_cache_path)?; } Ok(()) } - async fn recreate_http_client_and_dependents( - &mut self, - ) -> Result<(), AnyError> { - self - .set_new_global_cache_path(self.maybe_global_cache_path.clone()) - .await + fn recreate_http_client_and_dependents(&mut self) -> Result<(), AnyError> { + self.set_new_global_cache_path(self.maybe_global_cache_path.clone()) } /// Recreates the http client and all dependent structs. - async fn set_new_global_cache_path( + fn set_new_global_cache_path( &mut self, new_cache_path: Option<PathBuf>, ) -> Result<(), AnyError> { @@ -1025,21 +1019,21 @@ impl Inner { async fn update_registries(&mut self) -> Result<(), AnyError> { let mark = self.performance.mark("lsp.update_registries"); - self.recreate_http_client_and_dependents().await?; + self.recreate_http_client_and_dependents()?; let workspace_settings = self.config.workspace_settings(); for (registry, enabled) in workspace_settings.suggest.imports.hosts.iter() { if *enabled { lsp_log!("Enabling import suggestions for: {}", registry); self.module_registries.enable(registry).await?; } else { - self.module_registries.disable(registry).await?; + self.module_registries.disable(registry)?; } } self.performance.measure(mark); Ok(()) } - async fn update_config_file(&mut self) -> Result<(), AnyError> { + fn update_config_file(&mut self) -> Result<(), AnyError> { self.config.clear_config_file(); self.fmt_options = FmtOptions::new_with_base(self.initial_cwd.clone()); self.lint_options = LintOptions::new_with_base(self.initial_cwd.clone()); @@ -1064,7 +1058,7 @@ impl Inner { self.config.set_config_file(config_file); self.lint_options = lint_options; self.fmt_options = fmt_options; - self.recreate_http_client_and_dependents().await?; + self.recreate_http_client_and_dependents()?; if let Some(config_file) = self.config.maybe_config_file() { if let Ok((compiler_options, _)) = config_file.to_compiler_options() { if let Some(compiler_options_obj) = compiler_options.as_object() { @@ -1278,11 +1272,11 @@ impl Inner { self.update_debug_flag(); // Check to see if we need to change the cache path - if let Err(err) = self.update_cache().await { + if let Err(err) = self.update_cache() { lsp_warn!("Error updating cache: {:#}", err); self.client.show_message(MessageType::WARNING, err); } - if let Err(err) = self.update_config_file().await { + if let Err(err) = self.update_config_file() { lsp_warn!("Error updating config file: {:#}", err); self.client.show_message(MessageType::WARNING, err); } @@ -1349,11 +1343,11 @@ impl Inner { self.refresh_npm_specifiers().await; } - async fn shutdown(&self) -> LspResult<()> { + fn shutdown(&self) -> LspResult<()> { Ok(()) } - async fn did_open( + fn did_open( &mut self, specifier: &ModuleSpecifier, params: DidOpenTextDocumentParams, @@ -1475,7 +1469,7 @@ impl Inner { }; self.update_debug_flag(); - if let Err(err) = self.update_cache().await { + if let Err(err) = self.update_cache() { lsp_warn!("Error updating cache: {:#}", err); self.client.show_message(MessageType::WARNING, err); } @@ -1483,7 +1477,7 @@ impl Inner { lsp_warn!("Error updating registries: {:#}", err); self.client.show_message(MessageType::WARNING, err); } - if let Err(err) = self.update_config_file().await { + if let Err(err) = self.update_config_file() { lsp_warn!("Error updating config file: {:#}", err); self.client.show_message(MessageType::WARNING, err); } @@ -1601,7 +1595,7 @@ impl Inner { files_to_check.insert(url.clone()); } // Update config. - if let Err(err) = self.update_config_file().await { + if let Err(err) = self.update_config_file() { lsp_warn!("Error updating config file: {:#}", err); self.client.show_message(MessageType::WARNING, err); } @@ -2246,7 +2240,7 @@ impl Inner { )), ) .await?; - code_action.edit = refactor_edit_info.to_workspace_edit(self).await?; + code_action.edit = refactor_edit_info.to_workspace_edit(self)?; code_action } else { // The code action doesn't need to be resolved @@ -2314,7 +2308,6 @@ impl Inner { line_index, &navigation_tree, ) - .await .map_err(|err| { error!( "Error getting ts code lenses for \"{:#}\": {:#}", @@ -2483,7 +2476,7 @@ impl Inner { .await?; if let Some(definition) = maybe_definition { - let results = definition.to_definition(line_index, self).await; + let results = definition.to_definition(line_index, self); self.performance.measure(mark); Ok(results) } else { @@ -2978,7 +2971,6 @@ impl Inner { let rename_locations = tsc::RenameLocations { locations }; let workspace_edits = rename_locations .into_workspace_edit(¶ms.new_name, self) - .await .map_err(|err| { error!("Failed to get workspace edits: {:#}", err); LspError::internal_error() @@ -3426,7 +3418,7 @@ impl tower_lsp::LanguageServer for LanguageServer { async fn shutdown(&self) -> LspResult<()> { self.1.cancel(); - self.0.write().await.shutdown().await + self.0.write().await.shutdown() } async fn did_open(&self, params: DidOpenTextDocumentParams) { @@ -3441,7 +3433,7 @@ impl tower_lsp::LanguageServer for LanguageServer { let specifier = inner .url_map .normalize_url(¶ms.text_document.uri, LspUrlKind::File); - let document = inner.did_open(&specifier, params).await; + let document = inner.did_open(&specifier, params); if document.is_diagnosable() { inner.refresh_npm_specifiers().await; let specifiers = inner.documents.dependents(&specifier); diff --git a/cli/lsp/registries.rs b/cli/lsp/registries.rs index 2b0cae7d2..b0eeb9df0 100644 --- a/cli/lsp/registries.rs +++ b/cli/lsp/registries.rs @@ -488,7 +488,7 @@ impl ModuleRegistry { } /// Disable a registry, removing its configuration, if any, from memory. - pub async fn disable(&mut self, origin: &str) -> Result<(), AnyError> { + pub fn disable(&mut self, origin: &str) -> Result<(), AnyError> { let origin = base_url(&Url::parse(origin)?); self.origins.remove(&origin); Ok(()) diff --git a/cli/lsp/testing/execution.rs b/cli/lsp/testing/execution.rs index 02d037996..6b89f0e43 100644 --- a/cli/lsp/testing/execution.rs +++ b/cli/lsp/testing/execution.rs @@ -213,7 +213,7 @@ impl TestRun { let args = self.get_args(); lsp_log!("Executing test run with arguments: {}", args.join(" ")); let flags = flags_from_vec(args.into_iter().map(String::from).collect())?; - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; // Various test files should not share the same permissions in terms of // `PermissionsContainer` - otherwise granting/revoking permissions in one // file would have impact on other files, which is undesirable. diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs index 104024167..3fc78a20f 100644 --- a/cli/lsp/tsc.rs +++ b/cli/lsp/tsc.rs @@ -2106,7 +2106,7 @@ pub struct RenameLocations { } impl RenameLocations { - pub async fn into_workspace_edit( + pub fn into_workspace_edit( self, new_name: &str, language_server: &language_server::Inner, @@ -2226,7 +2226,7 @@ impl DefinitionInfoAndBoundSpan { Ok(()) } - pub async fn to_definition( + pub fn to_definition( &self, line_index: Arc<LineIndex>, language_server: &language_server::Inner, @@ -2609,7 +2609,7 @@ impl RefactorEditInfo { Ok(()) } - pub async fn to_workspace_edit( + pub fn to_workspace_edit( &self, language_server: &language_server::Inner, ) -> LspResult<Option<lsp::WorkspaceEdit>> { diff --git a/cli/main.rs b/cli/main.rs index 3d72a3334..729559d9a 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -109,7 +109,7 @@ async fn run_subcommand(flags: Flags) -> Result<i32, AnyError> { tools::run::eval_command(flags, eval_flags).await }), DenoSubcommand::Cache(cache_flags) => spawn_subcommand(async move { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let module_load_preparer = factory.module_load_preparer().await?; let emitter = factory.emitter()?; let graph_container = factory.graph_container(); @@ -119,7 +119,7 @@ async fn run_subcommand(flags: Flags) -> Result<i32, AnyError> { emitter.cache_module_emits(&graph_container.graph()) }), DenoSubcommand::Check(check_flags) => spawn_subcommand(async move { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let module_load_preparer = factory.module_load_preparer().await?; module_load_preparer .load_and_type_check_files(&check_flags.files) @@ -137,7 +137,11 @@ async fn run_subcommand(flags: Flags) -> Result<i32, AnyError> { ) } DenoSubcommand::Init(init_flags) => { - spawn_subcommand(async { tools::init::init_project(init_flags).await }) + spawn_subcommand(async { + // make compiler happy since init_project is sync + tokio::task::yield_now().await; + tools::init::init_project(init_flags) + }) } DenoSubcommand::Info(info_flags) => { spawn_subcommand(async { tools::info::info(flags, info_flags).await }) diff --git a/cli/tools/bench/mod.rs b/cli/tools/bench/mod.rs index b554f7349..c640bea40 100644 --- a/cli/tools/bench/mod.rs +++ b/cli/tools/bench/mod.rs @@ -487,8 +487,7 @@ pub async fn run_benchmarks_with_watch( let bench_flags = bench_flags.clone(); Ok(async move { let factory = CliFactoryBuilder::new() - .build_from_flags_for_watcher(flags, watcher_communicator.clone()) - .await?; + .build_from_flags_for_watcher(flags, watcher_communicator.clone())?; let cli_options = factory.cli_options(); let bench_options = cli_options.resolve_bench_options(bench_flags)?; diff --git a/cli/tools/bundle.rs b/cli/tools/bundle.rs index 0a992fcb0..23d5aacb1 100644 --- a/cli/tools/bundle.rs +++ b/cli/tools/bundle.rs @@ -35,9 +35,10 @@ pub async fn bundle( move |flags, watcher_communicator, _changed_paths| { let bundle_flags = bundle_flags.clone(); Ok(async move { - let factory = CliFactoryBuilder::new() - .build_from_flags_for_watcher(flags, watcher_communicator.clone()) - .await?; + let factory = CliFactoryBuilder::new().build_from_flags_for_watcher( + flags, + watcher_communicator.clone(), + )?; let cli_options = factory.cli_options(); let _ = watcher_communicator.watch_paths(cli_options.watch_paths()); bundle_action(factory, &bundle_flags).await?; @@ -48,7 +49,7 @@ pub async fn bundle( ) .await?; } else { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; bundle_action(factory, &bundle_flags).await?; } diff --git a/cli/tools/compile.rs b/cli/tools/compile.rs index 0e8df2952..ed8f07542 100644 --- a/cli/tools/compile.rs +++ b/cli/tools/compile.rs @@ -22,7 +22,7 @@ pub async fn compile( flags: Flags, compile_flags: CompileFlags, ) -> Result<(), AnyError> { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let module_graph_creator = factory.module_graph_creator().await?; let parsed_source_cache = factory.parsed_source_cache(); diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs index 66c0923de..e5bd3ae2e 100644 --- a/cli/tools/coverage/mod.rs +++ b/cli/tools/coverage/mod.rs @@ -462,7 +462,7 @@ pub async fn cover_files( return Err(generic_error("No matching coverage profiles found")); } - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let npm_resolver = factory.npm_resolver().await?; let file_fetcher = factory.file_fetcher()?; let cli_options = factory.cli_options(); diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs index 013a407aa..b3240dd37 100644 --- a/cli/tools/doc.rs +++ b/cli/tools/doc.rs @@ -17,7 +17,6 @@ use deno_config::glob::PathOrPatternSet; use deno_core::anyhow::bail; use deno_core::anyhow::Context; use deno_core::error::AnyError; -use deno_core::futures::FutureExt; use deno_doc as doc; use deno_graph::GraphKind; use deno_graph::ModuleAnalyzer; @@ -73,7 +72,7 @@ async fn generate_doc_nodes_for_builtin_types( } pub async fn doc(flags: Flags, doc_flags: DocFlags) -> Result<(), AnyError> { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let module_info_cache = factory.module_info_cache()?; let parsed_source_cache = factory.parsed_source_cache(); @@ -156,8 +155,6 @@ pub async fn doc(flags: Flags, doc_flags: DocFlags) -> Result<(), AnyError> { }; generate_docs_directory(&doc_nodes_by_url, html_options, deno_ns) - .boxed_local() - .await } else { let modules_len = doc_nodes_by_url.len(); let doc_nodes = @@ -224,7 +221,7 @@ impl deno_doc::html::HrefResolver for DocResolver { } } -async fn generate_docs_directory( +fn generate_docs_directory( doc_nodes_by_url: &IndexMap<ModuleSpecifier, Vec<doc::DocNode>>, html_options: &DocHtmlFlag, deno_ns: std::collections::HashSet<Vec<String>>, diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs index 0f6afb232..241648d98 100644 --- a/cli/tools/fmt.rs +++ b/cli/tools/fmt.rs @@ -68,7 +68,7 @@ pub async fn format(flags: Flags, fmt_flags: FmtFlags) -> Result<(), AnyError> { move |flags, watcher_communicator, changed_paths| { let fmt_flags = fmt_flags.clone(); Ok(async move { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let fmt_options = cli_options.resolve_fmt_options(fmt_flags)?; let files = @@ -113,7 +113,7 @@ pub async fn format(flags: Flags, fmt_flags: FmtFlags) -> Result<(), AnyError> { ) .await?; } else { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let fmt_options = cli_options.resolve_fmt_options(fmt_flags)?; let files = diff --git a/cli/tools/info.rs b/cli/tools/info.rs index ca08003ad..7c1d6761a 100644 --- a/cli/tools/info.rs +++ b/cli/tools/info.rs @@ -36,7 +36,7 @@ use crate::npm::ManagedCliNpmResolver; use crate::util::checksum; pub async fn info(flags: Flags, info_flags: InfoFlags) -> Result<(), AnyError> { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); if let Some(specifier) = info_flags.file { let module_graph_builder = factory.module_graph_builder().await?; diff --git a/cli/tools/init/mod.rs b/cli/tools/init/mod.rs index d0e199085..7222a762f 100644 --- a/cli/tools/init/mod.rs +++ b/cli/tools/init/mod.rs @@ -32,7 +32,7 @@ fn create_file( } } -pub async fn init_project(init_flags: InitFlags) -> Result<(), AnyError> { +pub fn init_project(init_flags: InitFlags) -> Result<(), AnyError> { let cwd = std::env::current_dir().context("Can't read current working directory.")?; let dir = if let Some(dir) = &init_flags.dir { diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs index a48599ada..1b1b6f30c 100644 --- a/cli/tools/installer.rs +++ b/cli/tools/installer.rs @@ -242,8 +242,7 @@ pub async fn install_command( install_flags: InstallFlags, ) -> Result<(), AnyError> { // ensure the module is cached - CliFactory::from_flags(flags.clone()) - .await? + CliFactory::from_flags(flags.clone())? .module_load_preparer() .await? .load_and_type_check_files(&[install_flags.module_url.clone()]) diff --git a/cli/tools/jupyter/mod.rs b/cli/tools/jupyter/mod.rs index cf1a44ea5..cfed1c399 100644 --- a/cli/tools/jupyter/mod.rs +++ b/cli/tools/jupyter/mod.rs @@ -54,7 +54,7 @@ pub async fn kernel( logger::init(Some(log::Level::Debug)); } - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let main_module = resolve_url_or_path("./$deno$jupyter.ts", cli_options.initial_cwd()) diff --git a/cli/tools/lint/mod.rs b/cli/tools/lint/mod.rs index 1b81fca5a..251efd941 100644 --- a/cli/tools/lint/mod.rs +++ b/cli/tools/lint/mod.rs @@ -74,7 +74,7 @@ pub async fn lint(flags: Flags, lint_flags: LintFlags) -> Result<(), AnyError> { move |flags, watcher_communicator, changed_paths| { let lint_flags = lint_flags.clone(); Ok(async move { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let lint_options = cli_options.resolve_lint_options(lint_flags)?; let files = collect_lint_files(lint_options.files.clone()).and_then( @@ -110,7 +110,7 @@ pub async fn lint(flags: Flags, lint_flags: LintFlags) -> Result<(), AnyError> { ) .await?; } else { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let is_stdin = lint_flags.is_stdin(); let lint_options = cli_options.resolve_lint_options(lint_flags)?; diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs index b35f903c1..d2c1010f7 100644 --- a/cli/tools/registry/mod.rs +++ b/cli/tools/registry/mod.rs @@ -910,7 +910,7 @@ pub async fn publish( flags: Flags, publish_flags: PublishFlags, ) -> Result<(), AnyError> { - let cli_factory = CliFactory::from_flags(flags).await?; + let cli_factory = CliFactory::from_flags(flags)?; let auth_method = get_auth_method(publish_flags.token, publish_flags.dry_run)?; diff --git a/cli/tools/registry/pm.rs b/cli/tools/registry/pm.rs index e9044a5d1..8a0a53c9a 100644 --- a/cli/tools/registry/pm.rs +++ b/cli/tools/registry/pm.rs @@ -26,7 +26,7 @@ use crate::jsr::JsrFetchResolver; use crate::npm::NpmFetchResolver; pub async fn add(flags: Flags, add_flags: AddFlags) -> Result<(), AnyError> { - let cli_factory = CliFactory::from_flags(flags.clone()).await?; + let cli_factory = CliFactory::from_flags(flags.clone())?; let cli_options = cli_factory.cli_options(); let Some(config_file) = cli_options.maybe_config_file() else { diff --git a/cli/tools/repl/mod.rs b/cli/tools/repl/mod.rs index 98519b60d..698abb691 100644 --- a/cli/tools/repl/mod.rs +++ b/cli/tools/repl/mod.rs @@ -152,7 +152,7 @@ async fn read_eval_file( } pub async fn run(flags: Flags, repl_flags: ReplFlags) -> Result<i32, AnyError> { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let main_module = cli_options.resolve_main_module()?; let permissions = PermissionsContainer::new(Permissions::from_options( diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs index 65e27136f..039dc0d71 100644 --- a/cli/tools/repl/session.rs +++ b/cli/tools/repl/session.rs @@ -200,7 +200,7 @@ impl ReplSession { test_event_receiver: TestEventReceiver, ) -> Result<Self, AnyError> { let language_server = ReplLanguageServer::new_initialized().await?; - let mut session = worker.create_inspector_session().await; + let mut session = worker.create_inspector_session(); worker .js_runtime diff --git a/cli/tools/run/mod.rs b/cli/tools/run/mod.rs index 0de852fc2..793b55a8a 100644 --- a/cli/tools/run/mod.rs +++ b/cli/tools/run/mod.rs @@ -39,7 +39,7 @@ To grant permissions, set them before the script argument. For example: // TODO(bartlomieju): actually I think it will also fail if there's an import // map specified and bare specifier is used on the command line - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let deno_dir = factory.deno_dir()?; let http_client = factory.http_client(); let cli_options = factory.cli_options(); @@ -76,7 +76,7 @@ To grant permissions, set them before the script argument. For example: } pub async fn run_from_stdin(flags: Flags) -> Result<i32, AnyError> { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let main_module = cli_options.resolve_main_module()?; @@ -121,8 +121,7 @@ async fn run_with_watch( move |flags, watcher_communicator, _changed_paths| { Ok(async move { let factory = CliFactoryBuilder::new() - .build_from_flags_for_watcher(flags, watcher_communicator.clone()) - .await?; + .build_from_flags_for_watcher(flags, watcher_communicator.clone())?; let cli_options = factory.cli_options(); let main_module = cli_options.resolve_main_module()?; @@ -158,7 +157,7 @@ pub async fn eval_command( flags: Flags, eval_flags: EvalFlags, ) -> Result<i32, AnyError> { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let file_fetcher = factory.file_fetcher()?; let main_module = cli_options.resolve_main_module()?; diff --git a/cli/tools/task.rs b/cli/tools/task.rs index dfb0c585e..124d760db 100644 --- a/cli/tools/task.rs +++ b/cli/tools/task.rs @@ -32,7 +32,7 @@ pub async fn execute_script( flags: Flags, task_flags: TaskFlags, ) -> Result<i32, AnyError> { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let tasks_config = cli_options.resolve_tasks_config()?; let maybe_package_json = cli_options.maybe_package_json(); diff --git a/cli/tools/test/mod.rs b/cli/tools/test/mod.rs index ec6c36255..a95590433 100644 --- a/cli/tools/test/mod.rs +++ b/cli/tools/test/mod.rs @@ -1479,7 +1479,7 @@ pub async fn run_tests( flags: Flags, test_flags: TestFlags, ) -> Result<(), AnyError> { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let cli_options = factory.cli_options(); let test_options = cli_options.resolve_test_options(test_flags)?; let file_fetcher = factory.file_fetcher()?; @@ -1577,8 +1577,7 @@ pub async fn run_tests_with_watch( let test_flags = test_flags.clone(); Ok(async move { let factory = CliFactoryBuilder::new() - .build_from_flags_for_watcher(flags, watcher_communicator.clone()) - .await?; + .build_from_flags_for_watcher(flags, watcher_communicator.clone())?; let cli_options = factory.cli_options(); let test_options = cli_options.resolve_test_options(test_flags)?; diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs index c66fa0b3e..86a271c1f 100644 --- a/cli/tools/upgrade.rs +++ b/cli/tools/upgrade.rs @@ -376,7 +376,7 @@ pub async fn upgrade( flags: Flags, upgrade_flags: UpgradeFlags, ) -> Result<(), AnyError> { - let factory = CliFactory::from_flags(flags).await?; + let factory = CliFactory::from_flags(flags)?; let client = factory.http_client(); let current_exe_path = std::env::current_exe()?; let output_exe_path = diff --git a/cli/worker.rs b/cli/worker.rs index 697514477..f0c7bfabc 100644 --- a/cli/worker.rs +++ b/cli/worker.rs @@ -355,7 +355,7 @@ impl CliMainWorker { return Ok(None); }; - let session = self.worker.create_inspector_session().await; + let session = self.worker.create_inspector_session(); let mut hmr_runner = setup_hmr_runner(session); @@ -379,7 +379,7 @@ impl CliMainWorker { return Ok(None); }; - let session = self.worker.create_inspector_session().await; + let session = self.worker.create_inspector_session(); let mut coverage_collector = create_coverage_collector(session); self .worker |