summaryrefslogtreecommitdiff
path: root/cli/tools
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tools')
-rw-r--r--cli/tools/bench/mod.rs3
-rw-r--r--cli/tools/bundle.rs9
-rw-r--r--cli/tools/compile.rs2
-rw-r--r--cli/tools/coverage/mod.rs2
-rw-r--r--cli/tools/doc.rs7
-rw-r--r--cli/tools/fmt.rs4
-rw-r--r--cli/tools/info.rs2
-rw-r--r--cli/tools/init/mod.rs2
-rw-r--r--cli/tools/installer.rs3
-rw-r--r--cli/tools/jupyter/mod.rs2
-rw-r--r--cli/tools/lint/mod.rs4
-rw-r--r--cli/tools/registry/mod.rs2
-rw-r--r--cli/tools/registry/pm.rs2
-rw-r--r--cli/tools/repl/mod.rs2
-rw-r--r--cli/tools/repl/session.rs2
-rw-r--r--cli/tools/run/mod.rs9
-rw-r--r--cli/tools/task.rs2
-rw-r--r--cli/tools/test/mod.rs5
-rw-r--r--cli/tools/upgrade.rs2
19 files changed, 30 insertions, 36 deletions
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 =
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 16:00:09 +0000