fix(test2): Maintain fn path with #[test] macro

Author: skogseth

crates/libtest2/src/macros.rs

@@ -103,37 +103,38 @@ macro_rules! _test_parse {
 
     // End result
     (break: name=$name:ident body=[($($params:tt)*) $($item:tt)*] $(ignore=$ignore:tt)? $(should_panic=$should_panic:tt)?) => {
-        #[allow(non_camel_case_types)]
-        struct $name;
+        fn $name($($params)*) $($item)*
 
-        impl $crate::Case for $name {
-            fn name(&self) -> &str {
-                $crate::_private::push!(crate::TESTS, _: $crate::_private::DynCase = $crate::_private::DynCase(&$name));
+        const _: () = const {
+            struct Test;
+            
+            impl $crate::Case for Test {
+                fn name(&self) -> &str {
+                    $crate::_private::push!(crate::TESTS, _: $crate::_private::DynCase = $crate::_private::DynCase(&Test));
 
-                const FULL_PATH: &str = concat!(std::module_path!(), "::", stringify!($name));
-                let i = FULL_PATH.find("::").expect("we have inserted this in the line above so it must be there");
-                &FULL_PATH[(i+2)..]
-            }
-            fn kind(&self) -> $crate::_private::TestKind {
-                Default::default()
-            }
-            fn source(&self) -> Option<&$crate::_private::Source> {
-                None
-            }
-            fn exclusive(&self, _: &$crate::TestContext) -> bool {
-                false
-            }
-
-            fn run(&self, context: &$crate::TestContext) -> $crate::RunResult {
-                fn run($($params)*) $($item)*
+                    const FULL_PATH: &str = concat!(std::module_path!(), "::", stringify!($name));
+                    let i = FULL_PATH.find("::").expect("we have inserted this in the line above so it must be there");
+                    &FULL_PATH[(i+2)..]
+                }
+                fn kind(&self) -> $crate::_private::TestKind {
+                    Default::default()
+                }
+                fn source(&self) -> Option<&$crate::_private::Source> {
+                    None
+                }
+                fn exclusive(&self, _: &$crate::TestContext) -> bool {
+                    false
+                }
 
-                $crate::_private::parse_ignore!(context, $($ignore)?);
+                fn run(&self, context: &$crate::TestContext) -> $crate::RunResult {
+                    $crate::_private::parse_ignore!(context, $($ignore)?);
 
-                use $crate::IntoRunResult;
-                let result = $crate::_private::run_test!($crate::_private::test_expr!(context, [$($params)*]), $($should_panic)?);
-                IntoRunResult::into_run_result(result)
+                    use $crate::IntoRunResult;
+                    let result = $crate::_private::run_test!($crate::_private::test_expr!($name, context, [$($params)*]), $($should_panic)?);
+                    IntoRunResult::into_run_result(result)
+                }
             }
-        }
+        };
     };
 }
 
@@ -152,11 +153,11 @@ macro_rules! _parse_ignore {
 #[macro_export]
 #[doc(hidden)]
 macro_rules! _test_expr {
-    ($context:expr, []) => {
-        run()
+    ($name:ident, $context:expr, []) => {
+        $name()
     };
-    ($context:expr, [$($params:tt)+]) => {
-        run($context)
+    ($name:ident, $context:expr, [$($params:tt)+]) => {
+        $name($context)
     };
 }
 

crates/libtest2/tests/testsuite/macros.rs

@@ -15,6 +15,16 @@ fn foo(_context: &libtest2::TestContext) {}
 mod some_module {
     #[libtest2::test]
     fn foo(_context: &libtest2::TestContext) {}
+
+    #[libtest2::test]
+    fn can_call_foo(context: &libtest2::TestContext) {
+        foo(context);
+    }
+    
+    #[libtest2::test]
+    fn can_call_super_foo(context: &libtest2::TestContext) {
+        super::foo(context);
+    }
 }
 
 #[libtest2::test]
@@ -51,17 +61,19 @@ fn context_as_pattern(libtest2::TestContext { .. }: &libtest2::TestContext) {}
 fn check() {
     let data = str![[r#"
 
-running 8 tests
-test context_as_pattern          ... ok
-test foo                         ... ok
-test ignored_context             ... ok
-test no_parameters               ... ok
-test no_parameters_return_result ... ok
-test some_module::foo            ... ok
-test takes_context               ... ok
-test takes_context_return_result ... ok
-
-test result: ok. 8 passed; 0 failed; 0 ignored; 0 filtered out; finished in [..]s
+running 10 tests
+test context_as_pattern              ... ok
+test foo                             ... ok
+test ignored_context                 ... ok
+test no_parameters                   ... ok
+test no_parameters_return_result     ... ok
+test some_module::can_call_foo       ... ok
+test some_module::can_call_super_foo ... ok
+test some_module::foo                ... ok
+test takes_context                   ... ok
+test takes_context_return_result     ... ok
+
+test result: ok. 10 passed; 0 failed; 0 ignored; 0 filtered out; finished in [..]s
 
 
 "#]];

crates/libtest2/tests/ui/unsupported_parameter.stderr

@@ -8,10 +8,8 @@ error[E0308]: mismatched types
   | arguments to this function are incorrect
   |
 note: function defined here
- --> tests/ui/unsupported_parameter.rs:4:1
+ --> tests/ui/unsupported_parameter.rs:5:4
   |
-4 | #[libtest2::test]
-  | ^^^^^^^^^^^^^^^^^
 5 | fn takes_integer(_: i32) {}
-  |                  ------
+  |    ^^^^^^^^^^^^^ ------
   = note: this error originates in the macro `$crate::_private::test_parse` which comes from the expansion of the attribute macro `libtest2::test` (in Nightly builds, run with -Z macro-backtrace for more info)