test_file_conditions does not need access to TestStatus

Author: oli-obk

src/config.rs

@@ -286,6 +286,28 @@ impl Config {
             Condition::OnHost => self.host_matches(target),
         }
     }
+
+    /// Returns whether according to the in-file conditions, this file should be run.
+    pub fn test_file_conditions(&self, comments: &Comments, revision: &str) -> bool {
+        if comments
+            .for_revision(revision)
+            .flat_map(|r| r.ignore.iter())
+            .any(|c| self.test_condition(c))
+        {
+            return self.run_only_ignored;
+        }
+        if comments
+            .for_revision(revision)
+            .any(|r| r.needs_asm_support && !self.has_asm_support())
+        {
+            return self.run_only_ignored;
+        }
+        comments
+            .for_revision(revision)
+            .flat_map(|r| r.only.iter())
+            .all(|c| self.test_condition(c))
+            ^ self.run_only_ignored
+    }
 }
 
 #[derive(Debug, Clone)]

src/lib.rs

@@ -389,7 +389,7 @@ fn parse_and_test_file(
         .map(|revision| {
             let status = status.for_revision(revision);
             // Ignore file if only/ignore rules do (not) apply
-            if !status.test_file_conditions(&comments, &config) {
+            if !config.test_file_conditions(&comments, revision) {
                 return TestRun {
                     result: Ok(TestOk::Ignored),
                     status,
@@ -1211,31 +1211,6 @@ fn output_path(
     path.with_extension(kind)
 }
 
-impl dyn TestStatus {
-    /// Returns whether according to the in-file conditions, this file should be run.
-    fn test_file_conditions(&self, comments: &Comments, config: &Config) -> bool {
-        let revision = self.revision();
-        if comments
-            .for_revision(revision)
-            .flat_map(|r| r.ignore.iter())
-            .any(|c| config.test_condition(c))
-        {
-            return config.run_only_ignored;
-        }
-        if comments
-            .for_revision(revision)
-            .any(|r| r.needs_asm_support && !config.has_asm_support())
-        {
-            return config.run_only_ignored;
-        }
-        comments
-            .for_revision(revision)
-            .flat_map(|r| r.only.iter())
-            .all(|c| config.test_condition(c))
-            ^ config.run_only_ignored
-    }
-}
-
 // Taken 1:1 from compiletest-rs
 fn get_pointer_width(triple: &str) -> u8 {
     if (triple.contains("64") && !triple.ends_with("gnux32") && !triple.ends_with("gnu_ilp32"))