[nextest-runner] update aho-corasick to 1.0.0

Author: sunshowers

Cargo.lock

@@ -531,7 +531,7 @@ impl TestBuildFilter {
             self.partition.clone(),
             &patterns,
             filter_exprs,
-        ))
+        )?)
     }
 
     fn merge_test_binary_args(

cargo-nextest/src/dispatch.rs

@@ -62,6 +62,11 @@ pub enum ExpectedError {
         #[from]
         err: ConfigParseError,
     },
+    #[error("test filter build error")]
+    TestFilterBuilderError {
+        #[from]
+        err: TestFilterBuilderError,
+    },
     #[error("unknown host platform")]
     UnknownHostPlatform {
         #[from]
@@ -325,6 +330,7 @@ impl ExpectedError {
             | Self::RootManifestNotFound { .. }
             | Self::CargoConfigError { .. }
             | Self::ConfigParseError { .. }
+            | Self::TestFilterBuilderError { .. }
             | Self::UnknownHostPlatform { .. }
             | Self::ArgumentFileReadError { .. }
             | Self::UnknownArchiveFormat { .. }
@@ -476,6 +482,10 @@ impl ExpectedError {
                     }
                 }
             }
+            Self::TestFilterBuilderError { err } => {
+                log::error!("{err}");
+                err.source()
+            }
             Self::UnknownHostPlatform { err } => {
                 log::error!("the host platform was unknown to nextest");
                 Some(err as &dyn Error)

cargo-nextest/src/errors.rs

@@ -13,7 +13,7 @@ rust-version = "1.66"
 
 [dependencies]
 atomicwrites = "0.4.1"
-aho-corasick = "0.7.20"
+aho-corasick = "1.0.1"
 async-scoped = { version = "0.7.1", features = ["use-tokio"] }
 future-queue = "0.3.0"
 bytes = "1.4.0"

nextest-runner/Cargo.toml

@@ -300,6 +300,19 @@ impl fmt::Display for PartitionerBuilderParseError {
     }
 }
 
+/// An error that occures while operating on a
+/// [`TestFilterBuilder`](crate::test_filter::TestFilterBuilder).
+#[derive(Clone, Debug, Error)]
+pub enum TestFilterBuilderError {
+    /// An error that occured while constructing test filters.
+    #[error("error constructing test filters")]
+    Construct {
+        /// The underlying error.
+        #[from]
+        error: aho_corasick::BuildError,
+    },
+}
+
 /// An error occurred in [`PathMapper::new`](crate::reuse_build::PathMapper::new).
 #[derive(Debug, Error)]
 pub enum PathMapperConstructError {

nextest-runner/src/errors.rs

@@ -970,7 +970,8 @@ mod tests {
             iter::empty::<String>(),
             // Test against the platform() predicate because this is the most important one here.
             vec![FilteringExpr::parse("platform(target)", &PACKAGE_GRAPH_FIXTURE).unwrap()],
-        );
+        )
+        .unwrap();
         let fake_cwd: Utf8PathBuf = "/fake/cwd".into();
         let fake_binary_name = "fake-binary".to_owned();
         let fake_binary_id = RustBinaryId::new("fake-package::fake-binary");

nextest-runner/src/list/test_list.rs

@@ -10,6 +10,7 @@
 // result
 
 use crate::{
+    errors::TestFilterBuilderError,
     helpers::convert_build_platform,
     list::RustTestArtifact,
     partition::{Partitioner, PartitionerBuilder},
@@ -77,24 +78,24 @@ impl TestFilterBuilder {
         partitioner_builder: Option<PartitionerBuilder>,
         patterns: impl IntoIterator<Item = impl Into<String>>,
         exprs: Vec<FilteringExpr>,
-    ) -> Self {
+    ) -> Result<Self, TestFilterBuilderError> {
         let mut patterns: Vec<_> = patterns.into_iter().map(|s| s.into()).collect();
         patterns.sort_unstable();
 
         let name_match = if patterns.is_empty() {
             NameMatch::EmptyPatterns
         } else {
-            let matcher = Box::new(AhoCorasick::new_auto_configured(&patterns));
+            let matcher = Box::new(AhoCorasick::new(&patterns)?);
 
             NameMatch::MatchSet { patterns, matcher }
         };
 
-        Self {
+        Ok(Self {
             run_ignored,
             partitioner_builder,
             name_match,
             exprs,
-        }
+        })
     }
 
     /// Creates a new `TestFilterBuilder` that matches any pattern by name.
@@ -315,7 +316,7 @@ mod tests {
         #[test]
         fn proptest_empty(test_names in vec(any::<String>(), 0..16)) {
             let patterns: &[String] = &[];
-            let test_filter = TestFilterBuilder::new(RunIgnored::Default, None, patterns, Vec::new());
+            let test_filter = TestFilterBuilder::new(RunIgnored::Default, None, patterns, Vec::new()).unwrap();
             let single_filter = test_filter.build();
             for test_name in test_names {
                 prop_assert!(single_filter.filter_name_match(&test_name).is_match());
@@ -325,7 +326,7 @@ mod tests {
         // Test that exact names match.
         #[test]
         fn proptest_exact(test_names in vec(any::<String>(), 0..16)) {
-            let test_filter = TestFilterBuilder::new(RunIgnored::Default, None, &test_names, Vec::new());
+            let test_filter = TestFilterBuilder::new(RunIgnored::Default, None, &test_names, Vec::new()).unwrap();
             let single_filter = test_filter.build();
             for test_name in test_names {
                 prop_assert!(single_filter.filter_name_match(&test_name).is_match());
@@ -344,7 +345,7 @@ mod tests {
                 patterns.push(substring);
             }
 
-            let test_filter = TestFilterBuilder::new(RunIgnored::Default, None, &patterns, Vec::new());
+            let test_filter = TestFilterBuilder::new(RunIgnored::Default, None, &patterns, Vec::new()).unwrap();
             let single_filter = test_filter.build();
             for test_name in test_names {
                 prop_assert!(single_filter.filter_name_match(&test_name).is_match());
@@ -360,7 +361,7 @@ mod tests {
         ) {
             prop_assume!(!substring.is_empty() && !(prefix.is_empty() && suffix.is_empty()));
             let pattern = prefix + &substring + &suffix;
-            let test_filter = TestFilterBuilder::new(RunIgnored::Default, None, [pattern], Vec::new());
+            let test_filter = TestFilterBuilder::new(RunIgnored::Default, None, [pattern], Vec::new()).unwrap();
             let single_filter = test_filter.build();
             prop_assert!(!single_filter.filter_name_match(&substring).is_match());
         }

nextest-runner/src/test_filter.rs

@@ -189,7 +189,8 @@ fn test_run_ignored() -> Result<()> {
         None,
         Vec::<String>::new(),
         vec![expr],
-    );
+    )
+    .unwrap();
     let test_list = FIXTURE_TARGETS.make_test_list(&test_filter, &TargetRunner::empty());
     let config = load_config();
     let profile = config
@@ -264,7 +265,8 @@ fn test_filter_expr_with_string_filters() -> Result<()> {
         None,
         ["call_dylib_add_two", "test_flaky_mod_4"],
         vec![expr],
-    );
+    )
+    .unwrap();
     let test_list = FIXTURE_TARGETS.make_test_list(&test_filter, &TargetRunner::empty());
     for test in test_list.iter_tests() {
         if test.name == "tests::call_dylib_add_two" {
@@ -322,7 +324,8 @@ fn test_filter_expr_without_string_filters() -> Result<()> {
     .expect("filter expression is valid");
 
     let test_filter =
-        TestFilterBuilder::new(RunIgnored::Default, None, Vec::<String>::new(), vec![expr]);
+        TestFilterBuilder::new(RunIgnored::Default, None, Vec::<String>::new(), vec![expr])
+            .unwrap();
     let test_list = FIXTURE_TARGETS.make_test_list(&test_filter, &TargetRunner::empty());
     for test in test_list.iter_tests() {
         if test.name.contains("test_multiply_two") || test.name == "tests::call_dylib_add_two" {
@@ -350,7 +353,8 @@ fn test_string_filters_without_filter_expr() -> Result<()> {
         None,
         vec!["test_multiply_two", "tests::call_dylib_add_two"],
         vec![],
-    );
+    )
+    .unwrap();
     let test_list = FIXTURE_TARGETS.make_test_list(&test_filter, &TargetRunner::empty());
     for test in test_list.iter_tests() {
         if test.name.contains("test_multiply_two")
@@ -528,7 +532,8 @@ fn test_termination() -> Result<()> {
         None,
         Vec::<String>::new(),
         vec![expr],
-    );
+    )
+    .unwrap();
 
     let test_list = FIXTURE_TARGETS.make_test_list(&test_filter, &TargetRunner::empty());
     let config = load_config();