[meta] share a single ParseContext everywhere

This allows caches to be reused across all filterset evaluations.

Author: sunshowers

cargo-nextest/src/dispatch.rs

@@ -286,12 +286,12 @@ impl ConfigOpts {
     pub fn make_config(
         &self,
         workspace_root: &Utf8Path,
-        graph: &PackageGraph,
+        pcx: &ParseContext<'_>,
         experimental: &BTreeSet<ConfigExperimental>,
     ) -> Result<NextestConfig> {
         NextestConfig::from_sources(
             workspace_root,
-            graph,
+            pcx,
             self.config_file.as_deref(),
             &self.tool_config_files,
             experimental,
@@ -1222,7 +1222,7 @@ impl BaseApp {
         })
     }
 
-    fn load_config(&self) -> Result<(VersionOnlyConfig, NextestConfig)> {
+    fn load_config(&self, pcx: &ParseContext<'_>) -> Result<(VersionOnlyConfig, NextestConfig)> {
         // Load the version-only config first to avoid incompatibilities with parsing the rest of
         // the config.
         let version_only_config = self
@@ -1244,7 +1244,7 @@ impl BaseApp {
 
         let config = self.config_opts.make_config(
             &self.workspace_root,
-            self.graph(),
+            pcx,
             version_only_config.experimental(),
         )?;
 
@@ -1421,7 +1421,8 @@ impl BaseApp {
         let path_mapper = PathMapper::noop();
 
         let build_platforms = binary_list.rust_build_meta.build_platforms.clone();
-        let (_, config) = self.load_config()?;
+        let pcx = ParseContext::new(self.graph());
+        let (_, config) = self.load_config(&pcx)?;
         let profile = self
             .load_profile(&config)?
             .apply_build_platforms(&build_platforms);
@@ -1547,13 +1548,12 @@ impl App {
         Ok(Self { base, build_filter })
     }
 
-    fn build_filtering_expressions(&self) -> Result<Vec<Filterset>> {
-        let pcx = ParseContext::new(self.base.graph());
+    fn build_filtering_expressions(&self, pcx: &ParseContext<'_>) -> Result<Vec<Filterset>> {
         let (exprs, all_errors): (Vec<_>, Vec<_>) = self
             .build_filter
             .filterset
             .iter()
-            .map(|input| Filterset::parse(input.clone(), &pcx, FiltersetKind::Test))
+            .map(|input| Filterset::parse(input.clone(), pcx, FiltersetKind::Test))
             .partition_result();
 
         if !all_errors.is_empty() {
@@ -1589,9 +1589,11 @@ impl App {
         list_type: ListType,
         output_writer: &mut OutputWriter,
     ) -> Result<()> {
-        let (version_only_config, config) = self.base.load_config()?;
+        let pcx = ParseContext::new(self.base.graph());
+
+        let (version_only_config, config) = self.base.load_config(&pcx)?;
         let profile = self.base.load_profile(&config)?;
-        let filter_exprs = self.build_filtering_expressions()?;
+        let filter_exprs = self.build_filtering_expressions(&pcx)?;
         let test_filter_builder = self.build_filter.make_test_filter_builder(filter_exprs)?;
 
         let binary_list = self.base.build_binary_list()?;
@@ -1650,7 +1652,8 @@ impl App {
         groups: Vec<TestGroup>,
         output_writer: &mut OutputWriter,
     ) -> Result<()> {
-        let (_, config) = self.base.load_config()?;
+        let pcx = ParseContext::new(self.base.graph());
+        let (_, config) = self.base.load_config(&pcx)?;
         let profile = self.base.load_profile(&config)?;
 
         // Validate test groups before doing any other work.
@@ -1662,7 +1665,7 @@ impl App {
         };
         let settings = ShowTestGroupSettings { mode, show_default };
 
-        let filter_exprs = self.build_filtering_expressions()?;
+        let filter_exprs = self.build_filtering_expressions(&pcx)?;
         let test_filter_builder = self.build_filter.make_test_filter_builder(filter_exprs)?;
 
         let binary_list = self.base.build_binary_list()?;
@@ -1705,7 +1708,8 @@ impl App {
         cli_args: Vec<String>,
         output_writer: &mut OutputWriter,
     ) -> Result<i32> {
-        let (version_only_config, config) = self.base.load_config()?;
+        let pcx = ParseContext::new(self.base.graph());
+        let (version_only_config, config) = self.base.load_config(&pcx)?;
         let profile = self.base.load_profile(&config)?;
 
         // Construct this here so that errors are reported before the build step.
@@ -1744,7 +1748,7 @@ impl App {
             CaptureStrategy::Combined
         };
 
-        let filter_exprs = self.build_filtering_expressions()?;
+        let filter_exprs = self.build_filtering_expressions(&pcx)?;
         let test_filter_builder = self.build_filter.make_test_filter_builder(filter_exprs)?;
 
         let binary_list = self.base.build_binary_list()?;

nextest-runner/src/config/archive.rs

@@ -248,6 +248,7 @@ mod tests {
     use camino_tempfile::tempdir;
     use config::ConfigError;
     use indoc::indoc;
+    use nextest_filtering::ParseContext;
     use test_case::test_case;
 
     #[test]
@@ -274,9 +275,11 @@ mod tests {
 
         let graph = temp_workspace(workspace_dir.path(), config_contents);
 
+        let pcx = ParseContext::new(&graph);
+
         let config = NextestConfig::from_sources(
             graph.workspace().root(),
-            &graph,
+            &pcx,
             None,
             [],
             &Default::default(),
@@ -424,9 +427,11 @@ mod tests {
 
         let graph = temp_workspace(workspace_path, config_contents);
 
+        let pcx = ParseContext::new(&graph);
+
         let config_err = NextestConfig::from_sources(
             graph.workspace().root(),
-            &graph,
+            &pcx,
             None,
             [],
             &Default::default(),

nextest-runner/src/config/config_impl.rs

@@ -21,9 +21,8 @@ use camino::{Utf8Path, Utf8PathBuf};
 use config::{
     builder::DefaultState, Config, ConfigBuilder, ConfigError, File, FileFormat, FileSourceFile,
 };
-use guppy::graph::PackageGraph;
 use indexmap::IndexMap;
-use nextest_filtering::{EvalContext, TestQuery};
+use nextest_filtering::{EvalContext, ParseContext, TestQuery};
 use serde::Deserialize;
 use std::{
     collections::{hash_map, BTreeMap, BTreeSet, HashMap},
@@ -96,7 +95,7 @@ impl NextestConfig {
     /// default config options.
     pub fn from_sources<'a, I>(
         workspace_root: impl Into<Utf8PathBuf>,
-        graph: &PackageGraph,
+        pcx: &ParseContext<'_>,
         config_file: Option<&Utf8Path>,
         tool_config_files: impl IntoIterator<IntoIter = I>,
         experimental: &BTreeSet<ConfigExperimental>,
@@ -106,7 +105,7 @@ impl NextestConfig {
     {
         Self::from_sources_impl(
             workspace_root,
-            graph,
+            pcx,
             config_file,
             tool_config_files,
             experimental,
@@ -135,7 +134,7 @@ impl NextestConfig {
     // A custom unknown_callback can be passed in while testing.
     fn from_sources_impl<'a, I>(
         workspace_root: impl Into<Utf8PathBuf>,
-        graph: &PackageGraph,
+        pcx: &ParseContext<'_>,
         config_file: Option<&Utf8Path>,
         tool_config_files: impl IntoIterator<IntoIter = I>,
         experimental: &BTreeSet<ConfigExperimental>,
@@ -147,7 +146,7 @@ impl NextestConfig {
         let workspace_root = workspace_root.into();
         let tool_config_files_rev = tool_config_files.into_iter().rev();
         let (inner, compiled) = Self::read_from_sources(
-            graph,
+            pcx,
             &workspace_root,
             config_file,
             tool_config_files_rev,
@@ -205,7 +204,7 @@ impl NextestConfig {
     // ---
 
     fn read_from_sources<'a>(
-        graph: &PackageGraph,
+        pcx: &ParseContext<'_>,
         workspace_root: &Utf8Path,
         file: Option<&Utf8Path>,
         tool_config_files_rev: impl Iterator<Item = &'a ToolConfigFile>,
@@ -226,7 +225,7 @@ impl NextestConfig {
         for ToolConfigFile { config_file, tool } in tool_config_files_rev {
             let source = File::new(config_file.as_str(), FileFormat::Toml);
             Self::deserialize_individual_config(
-                graph,
+                pcx,
                 workspace_root,
                 config_file,
                 Some(tool),
@@ -253,7 +252,7 @@ impl NextestConfig {
         };
 
         Self::deserialize_individual_config(
-            graph,
+            pcx,
             workspace_root,
             &config_file,
             None,
@@ -283,7 +282,7 @@ impl NextestConfig {
 
     #[expect(clippy::too_many_arguments)]
     fn deserialize_individual_config(
-        graph: &PackageGraph,
+        pcx: &ParseContext<'_>,
         workspace_root: &Utf8Path,
         config_file: &Utf8Path,
         tool: Option<&str>,
@@ -391,7 +390,7 @@ impl NextestConfig {
         }
 
         // Compile the overrides for this file.
-        let this_compiled = CompiledByProfile::new(graph, &this_config)
+        let this_compiled = CompiledByProfile::new(pcx, &this_config)
             .map_err(|kind| ConfigParseError::new(config_file, tool, kind))?;
 
         // Check that all overrides specify known test groups.
@@ -1097,11 +1096,13 @@ mod tests {
         let tool_path = workspace_root.join(".config/tool.toml");
         std::fs::write(&tool_path, tool_config_contents).unwrap();
 
+        let pcx = ParseContext::new(&graph);
+
         let mut unknown_keys = HashMap::new();
 
         let _ = NextestConfig::from_sources_impl(
             workspace_root,
-            &graph,
+            &pcx,
             None,
             &[ToolConfigFile {
                 tool: "my-tool".to_owned(),

nextest-runner/src/config/max_fail.rs

@@ -172,6 +172,7 @@ mod tests {
     };
     use camino_tempfile::tempdir;
     use indoc::indoc;
+    use nextest_filtering::ParseContext;
     use test_case::test_case;
 
     #[test]
@@ -243,9 +244,11 @@ mod tests {
         let workspace_dir = tempdir().unwrap();
         let graph = temp_workspace(workspace_dir.path(), config_contents);
 
+        let pcx = ParseContext::new(&graph);
+
         let config = NextestConfig::from_sources(
             graph.workspace().root(),
-            &graph,
+            &pcx,
             None,
             [],
             &Default::default(),
@@ -335,10 +338,11 @@ mod tests {
     fn invalid_fail_fast(config_contents: &str, error_str: &str) {
         let workspace_dir = tempdir().unwrap();
         let graph = temp_workspace(workspace_dir.path(), config_contents);
+        let pcx = ParseContext::new(&graph);
 
         let error = NextestConfig::from_sources(
             graph.workspace().root(),
-            &graph,
+            &pcx,
             None,
             [],
             &Default::default(),