summaryrefslogtreecommitdiff
path: root/cli/tools/test.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2023-04-14 16:22:33 -0400
committerGitHub <noreply@github.com>2023-04-14 16:22:33 -0400
commit136dce67cec749dce5989ea29e88359ef79a0045 (patch)
tree38e96bbbf22dc06cdba418a35467b215f1335549 /cli/tools/test.rs
parenta4111442191fff300132259752e6d2d5613d1871 (diff)
refactor: break up `ProcState` (#18707)
1. Breaks up functionality within `ProcState` into several other structs to break out the responsibilities (`ProcState` is only a data struct now). 2. Moves towards being able to inject dependencies more easily and have functionality only require what it needs. 3. Exposes `Arc<T>` around the "service structs" instead of it being embedded within them. The idea behind embedding them was to reduce the verbosity of needing to pass around `Arc<...>`, but I don't think it was exactly working and as we move more of these structs to be more injectable I don't think the extra verbosity will be a big deal.
Diffstat (limited to 'cli/tools/test.rs')
-rw-r--r--cli/tools/test.rs39
1 files changed, 22 insertions, 17 deletions
diff --git a/cli/tools/test.rs b/cli/tools/test.rs
index f90a68561..977073ab7 100644
--- a/cli/tools/test.rs
+++ b/cli/tools/test.rs
@@ -1259,14 +1259,15 @@ pub async fn check_specifiers(
ps.file_fetcher.insert_cached(file);
}
- ps.prepare_module_load(
- specifiers,
- false,
- lib,
- PermissionsContainer::new(Permissions::allow_all()),
- PermissionsContainer::new(permissions.clone()),
- )
- .await?;
+ ps.module_load_preparer
+ .prepare_module_load(
+ specifiers,
+ false,
+ lib,
+ PermissionsContainer::new(Permissions::allow_all()),
+ PermissionsContainer::new(permissions.clone()),
+ )
+ .await?;
}
let module_specifiers = specifiers
@@ -1280,14 +1281,15 @@ pub async fn check_specifiers(
})
.collect();
- ps.prepare_module_load(
- module_specifiers,
- false,
- lib,
- PermissionsContainer::allow_all(),
- PermissionsContainer::new(permissions),
- )
- .await?;
+ ps.module_load_preparer
+ .prepare_module_load(
+ module_specifiers,
+ false,
+ lib,
+ PermissionsContainer::allow_all(),
+ PermissionsContainer::new(permissions),
+ )
+ .await?;
Ok(())
}
@@ -1708,7 +1710,10 @@ pub async fn run_tests_with_watch(
} else {
test_modules.clone()
};
- let graph = ps.create_graph(test_modules.clone()).await?;
+ let graph = ps
+ .module_graph_builder
+ .create_graph(test_modules.clone())
+ .await?;
graph_valid_with_cli_options(&graph, &test_modules, &ps.options)?;
// TODO(@kitsonk) - This should be totally derivable from the graph.