f macro

Author: devrandom

ext-test-macro/src/lib.rs

@@ -46,9 +46,9 @@ pub fn xtest(attrs: TokenStream, item: TokenStream) -> TokenStream {
 	let expanded = match input {
 		Item::Mod(item_mod) => {
 			let cfg = if attrs.is_empty() {
-				quote! { #[cfg(test)] }
+				quote! { #[cfg_attr(test, test)] }
 			} else {
-				quote! { #[cfg(any(test, #attrs))] }
+				quote! { #[cfg_attr(test, test)] #[cfg(any(test, #attrs))] }
 			};
 			quote! {
 				#cfg
@@ -57,10 +57,23 @@ pub fn xtest(attrs: TokenStream, item: TokenStream) -> TokenStream {
 		},
 		Item::Fn(item_fn) => {
 			let cfg_attr = if attrs.is_empty() {
-				quote! { #[cfg(test)] }
+				// export the test if not actually testing
+				quote! { #[cfg_attr(test, test)] }
 			} else {
-				quote! { #[cfg(any(test, #attrs))] }
+				// export the test if the feature is enabled
+				quote! { #[cfg_attr(test, test)] #[cfg(any(test, #attrs))] }
 			};
+
+			// Check that the function doesn't take args and returns nothing
+			if !item_fn.sig.inputs.is_empty() || !matches!(item_fn.sig.output, syn::ReturnType::Default) {
+				return syn::Error::new_spanned(
+					item_fn.sig,
+					"xtest functions must not take arguments and must return nothing",
+				)
+				.to_compile_error()
+				.into();
+			}
+
 			quote! {
 				#cfg_attr
 				#item_fn