Move TestResult and co to their own module

Author: oli-obk

src/dependencies.rs

@@ -11,7 +11,8 @@ use std::{
 };
 
 use crate::{
-    build_aux, status_emitter::StatusEmitter, Config, Errored, Mode, OutputConflictHandling,
+    build_aux, status_emitter::StatusEmitter, test_result::Errored, Config, Mode,
+    OutputConflictHandling,
 };
 
 #[derive(Default, Debug)]
@@ -300,7 +301,7 @@ impl<'a> BuildManager<'a> {
             };
             build.done(
                 &res.as_ref()
-                    .map(|_| crate::TestOk::Ok)
+                    .map(|_| crate::test_result::TestOk::Ok)
                     .map_err(|()| Errored {
                         command: Command::new(what.description()),
                         errors: vec![],

src/lib.rs

@@ -23,6 +23,7 @@ use std::num::NonZeroUsize;
 use std::path::{Component, Path, PathBuf, Prefix};
 use std::process::{Command, ExitStatus, Output};
 use std::thread;
+use test_result::{Errored, TestOk, TestResult, TestRun};
 
 use crate::parser::{Comments, Condition};
 
@@ -38,6 +39,7 @@ mod parser;
 pub mod per_test_config;
 mod rustc_stderr;
 pub mod status_emitter;
+pub mod test_result;
 
 #[cfg(test)]
 mod tests;
@@ -161,35 +163,6 @@ pub fn test_command(mut config: Config, path: &Path) -> Result<Command> {
     Ok(result)
 }
 
-/// The possible non-failure results a single test can have.
-pub enum TestOk {
-    /// The test passed
-    Ok,
-    /// The test was ignored due to a rule (`//@only-*` or `//@ignore-*`)
-    Ignored,
-}
-
-/// The possible results a single test can have.
-pub type TestResult = Result<TestOk, Errored>;
-
-/// Information about a test failure.
-#[derive(Debug)]
-pub struct Errored {
-    /// Command that failed
-    command: Command,
-    /// The errors that were encountered.
-    errors: Vec<Error>,
-    /// The full stderr of the test run.
-    stderr: Vec<u8>,
-    /// The full stdout of the test run.
-    stdout: Vec<u8>,
-}
-
-struct TestRun {
-    result: TestResult,
-    status: Box<dyn status_emitter::TestStatus>,
-}
-
 /// A version of `run_tests` that allows more fine-grained control over running tests.
 ///
 /// All `configs` are being run in parallel.

src/parser.rs

@@ -8,7 +8,7 @@ use std::{
 use bstr::{ByteSlice, Utf8Error};
 use regex::bytes::Regex;
 
-use crate::{filter::Match, rustc_stderr::Level, Error, Errored, Mode};
+use crate::{filter::Match, rustc_stderr::Level, test_result::Errored, Error, Mode};
 
 use color_eyre::eyre::{Context, Result};
 

src/status_emitter.rs

@@ -8,8 +8,8 @@ use indicatif::{MultiProgress, ProgressBar, ProgressDrawTarget, ProgressStyle};
 use spanned::Span;
 
 use crate::{
-    github_actions, parser::Pattern, rustc_stderr::Level, Error, Errored, Errors, Format, Message,
-    TestOk, TestResult,
+    github_actions, parser::Pattern, rustc_stderr::Level, test_result::Errored,
+    test_result::TestOk, test_result::TestResult, Error, Errors, Format, Message,
 };
 use std::{
     collections::HashMap,

src/test_result.rs

@@ -0,0 +1,34 @@
+//! Various data structures used for carrying information about test success or failure
+
+use crate::{status_emitter::TestStatus, Error};
+use color_eyre::eyre::Result;
+use std::process::Command;
+
+/// The possible non-failure results a single test can have.
+pub enum TestOk {
+    /// The test passed
+    Ok,
+    /// The test was ignored due to a rule (`//@only-*` or `//@ignore-*`)
+    Ignored,
+}
+
+/// The possible results a single test can have.
+pub type TestResult = Result<TestOk, Errored>;
+
+/// Information about a test failure.
+#[derive(Debug)]
+pub struct Errored {
+    /// Command that failed
+    pub(crate) command: Command,
+    /// The errors that were encountered.
+    pub(crate) errors: Vec<Error>,
+    /// The full stderr of the test run.
+    pub(crate) stderr: Vec<u8>,
+    /// The full stdout of the test run.
+    pub(crate) stdout: Vec<u8>,
+}
+
+pub(crate) struct TestRun {
+    pub(crate) result: TestResult,
+    pub(crate) status: Box<dyn TestStatus>,
+}