fixup name in diagnostics

Author: jdonszelmann

compiler/rustc_builtin_macros/src/test.rs

@@ -117,13 +117,13 @@ pub(crate) fn expand_test_or_bench(
         Annotatable::Item(i) => (i, false),
         Annotatable::Stmt(box ast::Stmt { kind: ast::StmtKind::Item(i), .. }) => (i, true),
         other => {
-            not_testable_error(cx, attr_sp, None);
+            not_testable_error(cx, is_bench, attr_sp, None);
             return vec![other];
         }
     };
 
     let ast::ItemKind::Fn(fn_) = &item.kind else {
-        not_testable_error(cx, attr_sp, Some(&item));
+        not_testable_error(cx, is_bench, attr_sp, Some(&item));
         return if is_stmt {
             vec![Annotatable::Stmt(Box::new(cx.stmt_item(item.span, item)))]
         } else {
@@ -405,9 +405,10 @@ pub(crate) fn expand_test_or_bench(
     }
 }
 
-fn not_testable_error(cx: &ExtCtxt<'_>, attr_sp: Span, item: Option<&ast::Item>) {
+fn not_testable_error(cx: &ExtCtxt<'_>, is_bench: bool, attr_sp: Span, item: Option<&ast::Item>) {
     let dcx = cx.dcx();
-    let msg = "the `#[test]` attribute may only be used on a non-associated function";
+    let name = if is_bench { "bench" } else { "test" };
+    let msg = format!("the `#[{name}]` attribute may only be used on a non-associated function",);
     let level = match item.map(|i| &i.kind) {
         // These were a warning before #92959 and need to continue being that to avoid breaking
         // stable user code (#94508).
@@ -426,12 +427,16 @@ fn not_testable_error(cx: &ExtCtxt<'_>, attr_sp: Span, item: Option<&ast::Item>)
             ),
         );
     }
-    err.with_span_label(attr_sp, "the `#[test]` macro causes a function to be run as a test and has no effect on non-functions")
-        .with_span_suggestion(attr_sp,
+    err.span_label(attr_sp, format!("the `#[{name}]` macro causes a function to be run as a test and has no effect on non-functions"));
+
+    if !is_bench {
+        err.with_span_suggestion(attr_sp,
             "replace with conditional compilation to make the item only exist when tests are being run",
             "#[cfg(test)]",
-            Applicability::MaybeIncorrect)
-        .emit();
+            Applicability::MaybeIncorrect).emit();
+    } else {
+        err.emit();
+    }
 }
 
 fn get_location_info(cx: &ExtCtxt<'_>, fn_: &ast::Fn) -> (Symbol, usize, usize, usize, usize) {

tests/ui/feature-gates/gating-of-test-attrs.rs

@@ -26,22 +26,22 @@ mod test {
 // non-crate-level #[bench] attributes seem to be ignored.
 
 #[bench]
-//~^ ERROR the `#[test]` attribute may only be used on a non-associated function
+//~^ ERROR the `#[bench]` attribute may only be used on a non-associated function
 mod bench {
     mod inner { #![bench] }
     //~^ ERROR inner macro attributes are unstable
-    //~| ERROR the `#[test]` attribute may only be used on a non-associated function
+    //~| ERROR the `#[bench]` attribute may only be used on a non-associated function
 
     #[bench]
-    //~^ ERROR the `#[test]` attribute may only be used on a non-associated function
+    //~^ ERROR the `#[bench]` attribute may only be used on a non-associated function
     struct S;
 
     #[bench]
-    //~^ ERROR the `#[test]` attribute may only be used on a non-associated function
+    //~^ ERROR the `#[bench]` attribute may only be used on a non-associated function
     type T = S;
 
     #[bench]
-    //~^ ERROR the `#[test]` attribute may only be used on a non-associated function
+    //~^ ERROR the `#[bench]` attribute may only be used on a non-associated function
     impl S { }
 }
 

tests/ui/feature-gates/gating-of-test-attrs.stderr

@@ -87,24 +87,18 @@ LL -     #[test]
 LL +     #[cfg(test)]
    |
 
-error: the `#[test]` attribute may only be used on a non-associated function
+error: the `#[bench]` attribute may only be used on a non-associated function
   --> $DIR/gating-of-test-attrs.rs:28:1
    |
 LL |   #[bench]
-   |   ^^^^^^^^ the `#[test]` macro causes a function to be run as a test and has no effect on non-functions
+   |   ^^^^^^^^ the `#[bench]` macro causes a function to be run as a test and has no effect on non-functions
 LL |
 LL | / mod bench {
 LL | |     mod inner { #![bench] }
 ...  |
 LL | |     impl S { }
 LL | | }
    | |_- expected a non-associated function, found a module
-   |
-help: replace with conditional compilation to make the item only exist when tests are being run
-   |
-LL - #[bench]
-LL + #[cfg(test)]
-   |
 
 error[E0658]: inner macro attributes are unstable
   --> $DIR/gating-of-test-attrs.rs:31:20
@@ -116,65 +110,41 @@ LL |     mod inner { #![bench] }
    = help: add `#![feature(custom_inner_attributes)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error: the `#[test]` attribute may only be used on a non-associated function
+error: the `#[bench]` attribute may only be used on a non-associated function
   --> $DIR/gating-of-test-attrs.rs:31:17
    |
 LL |     mod inner { #![bench] }
    |     ------------^^^^^^^^^--
    |     |           |
-   |     |           the `#[test]` macro causes a function to be run as a test and has no effect on non-functions
+   |     |           the `#[bench]` macro causes a function to be run as a test and has no effect on non-functions
    |     expected a non-associated function, found a module
-   |
-help: replace with conditional compilation to make the item only exist when tests are being run
-   |
-LL -     mod inner { #![bench] }
-LL +     mod inner { #[cfg(test)] }
-   |
 
-error: the `#[test]` attribute may only be used on a non-associated function
+error: the `#[bench]` attribute may only be used on a non-associated function
   --> $DIR/gating-of-test-attrs.rs:35:5
    |
 LL |     #[bench]
-   |     ^^^^^^^^ the `#[test]` macro causes a function to be run as a test and has no effect on non-functions
+   |     ^^^^^^^^ the `#[bench]` macro causes a function to be run as a test and has no effect on non-functions
 LL |
 LL |     struct S;
    |     --------- expected a non-associated function, found a struct
-   |
-help: replace with conditional compilation to make the item only exist when tests are being run
-   |
-LL -     #[bench]
-LL +     #[cfg(test)]
-   |
 
-error: the `#[test]` attribute may only be used on a non-associated function
+error: the `#[bench]` attribute may only be used on a non-associated function
   --> $DIR/gating-of-test-attrs.rs:39:5
    |
 LL |     #[bench]
-   |     ^^^^^^^^ the `#[test]` macro causes a function to be run as a test and has no effect on non-functions
+   |     ^^^^^^^^ the `#[bench]` macro causes a function to be run as a test and has no effect on non-functions
 LL |
 LL |     type T = S;
    |     ----------- expected a non-associated function, found a type alias
-   |
-help: replace with conditional compilation to make the item only exist when tests are being run
-   |
-LL -     #[bench]
-LL +     #[cfg(test)]
-   |
 
-error: the `#[test]` attribute may only be used on a non-associated function
+error: the `#[bench]` attribute may only be used on a non-associated function
   --> $DIR/gating-of-test-attrs.rs:43:5
    |
 LL |     #[bench]
-   |     ^^^^^^^^ the `#[test]` macro causes a function to be run as a test and has no effect on non-functions
+   |     ^^^^^^^^ the `#[bench]` macro causes a function to be run as a test and has no effect on non-functions
 LL |
 LL |     impl S { }
    |     ---------- expected a non-associated function, found an implementation
-   |
-help: replace with conditional compilation to make the item only exist when tests are being run
-   |
-LL -     #[bench]
-LL +     #[cfg(test)]
-   |
 
 error: aborting due to 12 previous errors