Fold the macro google_test_wrapper into google_test.

The separate macro was only needed for some integration tests. That dependency has been removed, so there is no need for a separate macro now. Since the extra macro had to be part of the public API surface, this simplifies the API surface.

PiperOrigin-RevId: 497907221

Author: hovinenb

googletest/src/lib.rs

@@ -21,7 +21,7 @@ pub mod matcher;
 #[cfg(not(google3))]
 pub mod matchers;
 
-pub use googletest_macro::{google_test, google_test_wrapper};
+pub use googletest_macro::google_test;
 
 use internal::test_outcome::TestAssertionFailure;
 

googletest_macro/src/lib.rs

@@ -52,29 +52,11 @@ use syn::{parse_macro_input, ItemFn};
 pub fn google_test(
     _args: proc_macro::TokenStream,
     input: proc_macro::TokenStream,
-) -> proc_macro::TokenStream {
-    let parsed_fn = parse_macro_input!(input as ItemFn);
-    let output = quote! {
-        #[test]
-        #[googletest::google_test_wrapper]
-        #parsed_fn
-    };
-    output.into()
-}
-
-/// Wraps the given function inside an outer function which initialises and
-/// queries the `TestOutcome` for the current test.
-///
-/// This is intended to be used only by the Google Rust test library and its own
-/// tests.
-#[proc_macro_attribute]
-pub fn google_test_wrapper(
-    _args: proc_macro::TokenStream,
-    input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let parsed_fn = parse_macro_input!(input as ItemFn);
     let fn_name = parsed_fn.sig.ident.clone();
     let output = quote! {
+        #[test]
         fn #fn_name() -> std::result::Result<(), ()> {
             #parsed_fn