language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-08-04 19:08:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor(cli): fewer clones (#17450)

Browse source
This commit is contained in:
Geert-Jan Zwiers 2023-01-16 21:27:41 +01:00 • committed by GitHub
parent 40527526e5
commit e023a6e3f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cli/tools/bench.rs
View file

@ -538,7 +538,7 @@ pub async fn run_benchmarks_with_watch(
let paths_to_watch_clone = paths_to_watch.clone();
let files_changed = changed.is_some();
let bench_options = &bench_options;
let ps = ps.borrow();
let ps = ps.borrow().clone();
async move {
let bench_modules =
@ -617,7 +617,7 @@ pub async fn run_benchmarks_with_watch(
for path in changed.iter().filter_map(|path| {
deno_core::resolve_url_or_path(&path.to_string_lossy()).ok()
}) {
if modules.contains(&&path) {
if modules.contains(&path) {
modules_to_reload.push((specifier, ModuleKind::Esm));
break;
}
@ -651,16 +651,15 @@ pub async fn run_benchmarks_with_watch(
let operation = |modules_to_reload: Vec<(ModuleSpecifier, ModuleKind)>| {
let permissions = &permissions;
ps.borrow_mut().reset_for_file_watcher();
let ps = ps.borrow();
let bench_options = &bench_options;
ps.borrow_mut().reset_for_file_watcher();
let ps = ps.borrow().clone();
async move {
let specifiers =
collect_specifiers(&bench_options.files, is_supported_bench_path)?
.iter()
.into_iter()
.filter(|specifier| contains_specifier(&modules_to_reload, specifier))
.cloned()
.collect::<Vec<ModuleSpecifier>>();
check_specifiers(&ps, permissions.clone(), specifiers.clone()).await?;

12
cli/tools/test.rs
View file

@ -987,7 +987,7 @@ pub async fn check_specifiers(
/// Test a collection of specifiers with test modes concurrently.
async fn test_specifiers(
ps: ProcState,
ps: &ProcState,
permissions: &Permissions,
specifiers_with_mode: Vec<(ModuleSpecifier, TestMode)>,
options: TestSpecifierOptions,
@ -1328,7 +1328,7 @@ pub async fn run_tests(
}
test_specifiers(
ps,
&ps,
&permissions,
specifiers_with_mode,
TestSpecifierOptions {
@ -1361,7 +1361,6 @@ pub async fn run_tests_with_watch(
let paths_to_watch_clone = paths_to_watch.clone();
let files_changed = changed.is_some();
let test_options = &test_options;
let ps = ps.borrow().clone();
async move {
@ -1445,7 +1444,7 @@ pub async fn run_tests_with_watch(
for path in changed.iter().filter_map(|path| {
deno_core::resolve_url_or_path(&path.to_string_lossy()).ok()
}) {
if modules.contains(&&path) {
if modules.contains(&path) {
modules_to_reload.push((specifier, ModuleKind::Esm));
break;
}
@ -1490,11 +1489,10 @@ pub async fn run_tests_with_watch(
&test_options.doc,
)
.await?
.iter()
.into_iter()
.filter(|(specifier, _)| {
contains_specifier(&modules_to_reload, specifier)
})
.cloned()
.collect::<Vec<(ModuleSpecifier, TestMode)>>();
check_specifiers(&ps, permissions.clone(), specifiers_with_mode.clone())
@ -1505,7 +1503,7 @@ pub async fn run_tests_with_watch(
}
test_specifiers(
ps,
&ps,
permissions,
specifiers_with_mode,
TestSpecifierOptions {