Merge pull request #662 from google:status

PiperOrigin-RevId: 800899758

Author: copybara-github

googletest/src/lib.rs

@@ -91,7 +91,7 @@ use internal::test_outcome::{TestAssertionFailure, TestOutcome};
 /// of the (fatal) assertion failure which generated this result. Non-fatal
 /// assertion failures, which log the failure and report the test as having
 /// failed but allow it to continue running, are not encoded in this type.
-pub type Result<T> = std::result::Result<T, TestAssertionFailure>;
+pub type Result<T, E = TestAssertionFailure> = std::result::Result<T, E>;
 
 /// Returns a [`Result`] corresponding to the outcome of the currently running
 /// test.

googletest_macro/src/lib.rs

@@ -147,7 +147,7 @@ pub fn gtest(
                     quote! {},
                     match output_type {
                         Some(_) => quote! {result},
-                        None => quote! {googletest::Result::Ok(())},
+                        None => quote! {googletest::Result::<()>::Ok(())},
                     },
                     quote! {
                         async { #block }.await
@@ -188,7 +188,7 @@ pub fn gtest(
                     },
                     match output_type {
                         Some(_) => quote! {result},
-                        None => quote! {googletest::Result::Ok(())},
+                        None => quote! {googletest::Result::<()>::Ok(())},
                     },
                     quote! {
                         test()