feat(test2): Make RunResult optional

Author: epage

crates/libtest2-harness/src/error.rs

@@ -64,3 +64,19 @@ impl std::fmt::Display for Message {
 }
 
 impl std::error::Error for Message {}
+
+pub trait IntoRunResult {
+    fn into_run_result(self) -> RunResult;
+}
+
+impl IntoRunResult for () {
+    fn into_run_result(self) -> RunResult {
+        Ok(())
+    }
+}
+
+impl IntoRunResult for RunResult {
+    fn into_run_result(self) -> RunResult {
+        self
+    }
+}

crates/libtest2/examples/simple.rs

@@ -8,24 +8,17 @@ fn main() {}
 // Tests
 
 #[libtest2::test]
-fn check_toph(_context: &TestContext) -> RunResult {
-    Ok(())
-}
+fn check_toph(_context: &TestContext) {}
 #[libtest2::test]
-fn check_katara(_context: &TestContext) -> RunResult {
-    Ok(())
-}
+fn check_katara(_context: &TestContext) {}
 #[libtest2::test]
 fn check_sokka(_context: &TestContext) -> RunResult {
     Err(RunError::fail("Sokka tripped and fell :("))
 }
 #[libtest2::test]
 #[ignore = "slow"]
-fn long_computation(_context: &TestContext) -> RunResult {
+fn long_computation(_context: &TestContext) {
     std::thread::sleep(std::time::Duration::from_secs(1));
-    Ok(())
 }
 #[libtest2::test]
-fn compile_fail_dummy(_context: &TestContext) -> RunResult {
-    Ok(())
-}
+fn compile_fail_dummy(_context: &TestContext) {}

crates/libtest2/src/lib.rs

@@ -51,6 +51,7 @@ pub mod _private {
 
 pub use case::main;
 pub use case::FnCase;
+pub use libtest2_harness::IntoRunResult;
 pub use libtest2_harness::RunError;
 pub use libtest2_harness::RunResult;
 pub use libtest2_harness::TestContext;

crates/libtest2/src/macros.rs

@@ -58,7 +58,9 @@ macro_rules! _test_parse {
                     }
                 )*
 
-                run(context)
+                use $crate::IntoRunResult;
+                let result = run(context);
+                IntoRunResult::into_run_result(result)
             }
         }
     };

crates/libtest2/tests/testsuite/all_passing.rs

@@ -11,18 +11,15 @@ fn test_cmd() -> snapbox::cmd::Command {
 fn main() {}
 
 #[libtest2::test]
-fn foo(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn foo(_context: &libtest2::TestContext) {
 }
 
 #[libtest2::test]
-fn bar(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn bar(_context: &libtest2::TestContext) {
 }
 
 #[libtest2::test]
-fn barro(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn barro(_context: &libtest2::TestContext) {
 }
 "#,
             false,

crates/libtest2/tests/testsuite/argfile.rs

@@ -11,23 +11,19 @@ fn test_cmd() -> snapbox::cmd::Command {
 fn main() {}
 
 #[libtest2::test]
-fn one(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn one(_context: &libtest2::TestContext) {
 }
 
 #[libtest2::test]
-fn two(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn two(_context: &libtest2::TestContext) {
 }
 
 #[libtest2::test]
-fn three(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn three(_context: &libtest2::TestContext) {
 }
 
 #[libtest2::test]
-fn one_two(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn one_two(_context: &libtest2::TestContext) {
 }
 "#,
             false,

crates/libtest2/tests/testsuite/mixed_bag.rs

@@ -11,8 +11,7 @@ fn test_cmd() -> snapbox::cmd::Command {
 fn main() {}
 
 #[libtest2::test]
-fn cat(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn cat(_context: &libtest2::TestContext) {
 }
 
 #[libtest2::test]
@@ -21,8 +20,7 @@ fn dog(_context: &libtest2::TestContext) -> libtest2::RunResult {
 }
 
 #[libtest2::test]
-fn fox(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn fox(_context: &libtest2::TestContext) {
 }
 
 #[libtest2::test]
@@ -63,8 +61,7 @@ fn sheep(context: &libtest2::TestContext) -> libtest2::RunResult {
 
 #[libtest2::test]
 #[ignore = "slow"]
-fn horse(context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn horse(context: &libtest2::TestContext) {
 }
 "#,
             false,

crates/libtest2/tests/testsuite/panic.rs

@@ -11,12 +11,11 @@ fn test_cmd() -> snapbox::cmd::Command {
 fn main() {}
 
 #[libtest2::test]
-fn passes(_context: &libtest2::TestContext) -> libtest2::RunResult {
-    Ok(())
+fn passes(_context: &libtest2::TestContext) {
 }
 
 #[libtest2::test]
-fn panics(_context: &libtest2::TestContext) -> libtest2::RunResult {
+fn panics(_context: &libtest2::TestContext) {
     panic!("uh oh")
 }
 "#,