diff options
Diffstat (limited to 'cli/tools/bench.rs')
-rw-r--r-- | cli/tools/bench.rs | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/cli/tools/bench.rs b/cli/tools/bench.rs index 4538aabab..419ac2da6 100644 --- a/cli/tools/bench.rs +++ b/cli/tools/bench.rs @@ -4,7 +4,6 @@ use crate::args::BenchOptions; use crate::args::CliOptions; use crate::args::TypeCheckMode; use crate::colors; -use crate::graph_util::contains_specifier; use crate::graph_util::graph_valid; use crate::ops; use crate::proc_state::ProcState; @@ -24,7 +23,6 @@ use deno_core::futures::stream; use deno_core::futures::FutureExt; use deno_core::futures::StreamExt; use deno_core::ModuleSpecifier; -use deno_graph::ModuleKind; use deno_runtime::permissions::Permissions; use deno_runtime::permissions::PermissionsContainer; use deno_runtime::tokio_util::run_local; @@ -548,19 +546,9 @@ pub async fn run_benchmarks_with_watch( let mut modules_to_reload = if files_changed { Vec::new() } else { - bench_modules - .iter() - .map(|url| (url.clone(), ModuleKind::Esm)) - .collect() + bench_modules.clone() }; - let graph = ps - .create_graph( - bench_modules - .iter() - .map(|s| (s.clone(), ModuleKind::Esm)) - .collect(), - ) - .await?; + let graph = ps.create_graph(bench_modules.clone()).await?; graph_valid(&graph, !no_check, ps.options.check_js())?; // TODO(@kitsonk) - This should be totally derivable from the graph. @@ -618,7 +606,7 @@ pub async fn run_benchmarks_with_watch( deno_core::resolve_url_or_path(&path.to_string_lossy()).ok() }) { if modules.contains(&path) { - modules_to_reload.push((specifier, ModuleKind::Esm)); + modules_to_reload.push(specifier); break; } } @@ -649,7 +637,7 @@ pub async fn run_benchmarks_with_watch( }) }; - let operation = |modules_to_reload: Vec<(ModuleSpecifier, ModuleKind)>| { + let operation = |modules_to_reload: Vec<ModuleSpecifier>| { let permissions = &permissions; let bench_options = &bench_options; ps.borrow_mut().reset_for_file_watcher(); @@ -659,7 +647,7 @@ pub async fn run_benchmarks_with_watch( let specifiers = collect_specifiers(&bench_options.files, is_supported_bench_path)? .into_iter() - .filter(|specifier| contains_specifier(&modules_to_reload, specifier)) + .filter(|specifier| modules_to_reload.contains(specifier)) .collect::<Vec<ModuleSpecifier>>(); check_specifiers(&ps, permissions.clone(), specifiers.clone()).await?; |