refactor(test2): Pull out trial.rs

Author: epage

crates/libtest2/src/lib.rs

@@ -31,6 +31,7 @@
 #![warn(clippy::print_stdout)]
 
 mod macros;
+mod trial;
 
 #[doc(hidden)]
 pub mod _private {
@@ -41,80 +42,8 @@ pub use _private::main;
 pub use libtest2_harness::RunError;
 pub use libtest2_harness::RunResult;
 pub use libtest2_harness::TestContext;
-
-use libtest2_harness::Case;
-use libtest2_harness::Source;
-use libtest2_harness::TestKind;
-
-pub struct Trial {
-    name: String,
-    #[allow(clippy::type_complexity)]
-    runner: Box<dyn Fn(&TestContext) -> RunResult + Send + Sync>,
-}
-
-impl Trial {
-    pub fn test(
-        name: impl Into<String>,
-        runner: impl Fn(&TestContext) -> RunResult + Send + Sync + 'static,
-    ) -> Self {
-        Self {
-            name: name.into(),
-            runner: Box::new(runner),
-        }
-    }
-}
-
-impl Case for Trial {
-    fn name(&self) -> &str {
-        &self.name
-    }
-    fn kind(&self) -> TestKind {
-        Default::default()
-    }
-    fn source(&self) -> Option<&Source> {
-        None
-    }
-    fn exclusive(&self, _: &TestContext) -> bool {
-        false
-    }
-
-    fn run(&self, context: &TestContext) -> RunResult {
-        (self.runner)(context)
-    }
-}
-
-pub fn main(cases: impl IntoIterator<Item = impl Case + 'static>) {
-    let harness = libtest2_harness::Harness::new();
-    let harness = match harness.with_env() {
-        Ok(harness) => harness,
-        Err(err) => {
-            eprintln!("{err}");
-            ::std::process::exit(1);
-        }
-    };
-    let harness = match harness.parse() {
-        Ok(harness) => harness,
-        Err(err) => {
-            eprintln!("{err}");
-            ::std::process::exit(1);
-        }
-    };
-    let harness = match harness.discover(cases) {
-        Ok(harness) => harness,
-        Err(err) => {
-            eprintln!("{err}");
-            ::std::process::exit(libtest2_harness::ERROR_EXIT_CODE)
-        }
-    };
-    match harness.run() {
-        Ok(true) => ::std::process::exit(0),
-        Ok(false) => ::std::process::exit(libtest2_harness::ERROR_EXIT_CODE),
-        Err(err) => {
-            eprintln!("{err}");
-            ::std::process::exit(libtest2_harness::ERROR_EXIT_CODE)
-        }
-    }
-}
+pub use trial::main;
+pub use trial::Trial;
 
 #[doc = include_str!("../README.md")]
 #[cfg(doctest)]

crates/libtest2/src/trial.rs

@@ -0,0 +1,76 @@
+use libtest2_harness::Case;
+use libtest2_harness::Source;
+use libtest2_harness::TestKind;
+
+use crate::RunResult;
+use crate::TestContext;
+
+pub struct Trial {
+    name: String,
+    #[allow(clippy::type_complexity)]
+    runner: Box<dyn Fn(&TestContext) -> RunResult + Send + Sync>,
+}
+
+impl Trial {
+    pub fn test(
+        name: impl Into<String>,
+        runner: impl Fn(&TestContext) -> RunResult + Send + Sync + 'static,
+    ) -> Self {
+        Self {
+            name: name.into(),
+            runner: Box::new(runner),
+        }
+    }
+}
+
+impl Case for Trial {
+    fn name(&self) -> &str {
+        &self.name
+    }
+    fn kind(&self) -> TestKind {
+        Default::default()
+    }
+    fn source(&self) -> Option<&Source> {
+        None
+    }
+    fn exclusive(&self, _: &TestContext) -> bool {
+        false
+    }
+
+    fn run(&self, context: &TestContext) -> RunResult {
+        (self.runner)(context)
+    }
+}
+
+pub fn main(cases: impl IntoIterator<Item = impl Case + 'static>) {
+    let harness = libtest2_harness::Harness::new();
+    let harness = match harness.with_env() {
+        Ok(harness) => harness,
+        Err(err) => {
+            eprintln!("{err}");
+            ::std::process::exit(1);
+        }
+    };
+    let harness = match harness.parse() {
+        Ok(harness) => harness,
+        Err(err) => {
+            eprintln!("{err}");
+            ::std::process::exit(1);
+        }
+    };
+    let harness = match harness.discover(cases) {
+        Ok(harness) => harness,
+        Err(err) => {
+            eprintln!("{err}");
+            ::std::process::exit(libtest2_harness::ERROR_EXIT_CODE)
+        }
+    };
+    match harness.run() {
+        Ok(true) => ::std::process::exit(0),
+        Ok(false) => ::std::process::exit(libtest2_harness::ERROR_EXIT_CODE),
+        Err(err) => {
+            eprintln!("{err}");
+            ::std::process::exit(libtest2_harness::ERROR_EXIT_CODE)
+        }
+    }
+}