fix(test2): Rename Trial to FnCase

Author: epage

crates/libtest2/examples/tidy.rs

@@ -1,6 +1,6 @@
+use libtest2::FnCase;
 use libtest2::RunError;
 use libtest2::RunResult;
-use libtest2::Trial;
 
 fn main() -> std::io::Result<()> {
     let harness = ::libtest2_harness::Harness::new();
@@ -23,8 +23,8 @@ fn main() -> std::io::Result<()> {
 
 /// Creates one test for each `.rs` file in the current directory or
 /// sub-directories of the current directory.
-fn collect_tests() -> std::io::Result<Vec<Trial>> {
-    fn visit_dir(path: &std::path::Path, tests: &mut Vec<Trial>) -> std::io::Result<()> {
+fn collect_tests() -> std::io::Result<Vec<FnCase>> {
+    fn visit_dir(path: &std::path::Path, tests: &mut Vec<FnCase>) -> std::io::Result<()> {
         let current_dir = std::env::current_dir()?;
         for entry in std::fs::read_dir(path)? {
             let entry = entry?;
@@ -44,7 +44,7 @@ fn collect_tests() -> std::io::Result<Vec<Trial>> {
                     .to_string_lossy()
                     .into_owned();
 
-                    let test = Trial::test(name, move |_| check_file(&path));
+                    let test = FnCase::test(name, move |_| check_file(&path));
                     tests.push(test);
                 }
             } else if file_type.is_dir() {

crates/libtest2/src/trial.rs renamed to crates/libtest2/src/case.rs

@@ -5,13 +5,13 @@ use libtest2_harness::TestKind;
 use crate::RunResult;
 use crate::TestContext;
 
-pub struct Trial {
+pub struct FnCase {
     name: String,
     #[allow(clippy::type_complexity)]
     runner: Box<dyn Fn(&TestContext) -> RunResult + Send + Sync>,
 }
 
-impl Trial {
+impl FnCase {
     pub fn test(
         name: impl Into<String>,
         runner: impl Fn(&TestContext) -> RunResult + Send + Sync + 'static,
@@ -23,7 +23,7 @@ impl Trial {
     }
 }
 
-impl Case for Trial {
+impl Case for FnCase {
     fn name(&self) -> &str {
         &self.name
     }

crates/libtest2/src/lib.rs

@@ -30,20 +30,20 @@
 //#![warn(clippy::print_stderr)]
 #![warn(clippy::print_stdout)]
 
+mod case;
 mod macros;
-mod trial;
 
 #[doc(hidden)]
 pub mod _private {
     pub use crate::_main as main;
 }
 
 pub use _private::main;
+pub use case::main;
+pub use case::FnCase;
 pub use libtest2_harness::RunError;
 pub use libtest2_harness::RunResult;
 pub use libtest2_harness::TestContext;
-pub use trial::main;
-pub use trial::Trial;
 
 #[doc = include_str!("../README.md")]
 #[cfg(doctest)]

crates/libtest2/src/macros.rs

@@ -4,7 +4,7 @@ macro_rules! _main {
     ( $( $test:path ),* $(,)*) => {
         fn main() {
             $crate::main([
-                $($crate::Trial::test(::std::stringify!($test), $test)),*
+                $($crate::FnCase::test(::std::stringify!($test), $test)),*
         ]);
         }
     }