Add "functions with a body" target group

JonathanBrouwer · JonathanBrouwer · commit 2b59b34f2be3 · 2026-06-03T09:54:08.000+02:00
diff --git a/compiler/rustc_attr_parsing/src/target_checking.rs b/compiler/rustc_attr_parsing/src/target_checking.rs
@@ -344,6 +344,13 @@ pub(crate) fn allowed_targets_applied(
         Target::Method(MethodKind::Trait { body: true }),
         Target::Method(MethodKind::TraitImpl),
     ];
+    const FUNCTION_WITH_BODY_LIKE: &[Target] = &[
+        Target::Fn,
+        Target::Closure,
+        Target::Method(MethodKind::Inherent),
+        Target::Method(MethodKind::Trait { body: true }),
+        Target::Method(MethodKind::TraitImpl),
+    ];
     const METHOD_LIKE: &[Target] = &[
         Target::Method(MethodKind::Inherent),
         Target::Method(MethodKind::Trait { body: false }),
@@ -362,6 +369,13 @@ pub(crate) fn allowed_targets_applied(
         target,
         &mut added_fake_targets,
     );
+    filter_targets(
+        &mut allowed_targets,
+        FUNCTION_WITH_BODY_LIKE,
+        "functions with a body",
+        target,
+        &mut added_fake_targets,
+    );
     filter_targets(&mut allowed_targets, METHOD_LIKE, "methods", target, &mut added_fake_targets);
     filter_targets(&mut allowed_targets, IMPL_LIKE, "impl blocks", target, &mut added_fake_targets);
     filter_targets(&mut allowed_targets, ADT_LIKE, "data types", target, &mut added_fake_targets);
diff --git a/tests/ui/asm/naked-invalid-attr.stderr b/tests/ui/asm/naked-invalid-attr.stderr
@@ -18,7 +18,7 @@ error: `#[naked]` attribute cannot be used on foreign functions
 LL |     #[unsafe(naked)]
    |     ^^^^^^^^^^^^^^^^
    |
-   = help: `#[naked]` can be applied to functions and methods
+   = help: `#[naked]` can only be applied to functions with a body
 
 error: `#[naked]` attribute cannot be used on structs
   --> $DIR/naked-invalid-attr.rs:14:1
@@ -42,7 +42,7 @@ error: `#[naked]` attribute cannot be used on required trait methods
 LL |     #[unsafe(naked)]
    |     ^^^^^^^^^^^^^^^^
    |
-   = help: `#[naked]` can be applied to functions, inherent methods, provided trait methods, and trait methods in impl blocks
+   = help: `#[naked]` can only be applied to functions with a body
 
 error: `#[naked]` attribute cannot be used on closures
   --> $DIR/naked-invalid-attr.rs:52:5
diff --git a/tests/ui/attributes/codegen_attr_on_required_trait_method.stderr b/tests/ui/attributes/codegen_attr_on_required_trait_method.stderr
@@ -4,7 +4,7 @@ error: `#[cold]` attribute cannot be used on required trait methods
 LL |     #[cold]
    |     ^^^^^^^
    |
-   = help: `#[cold]` can be applied to closures, foreign functions, functions, inherent methods, provided trait methods, and trait methods in impl blocks
+   = help: `#[cold]` can be applied to foreign functions and functions with a body
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 note: the lint level is defined here
   --> $DIR/codegen_attr_on_required_trait_method.rs:1:9
@@ -18,7 +18,7 @@ error: `#[link_section]` attribute cannot be used on required trait methods
 LL |     #[link_section = "__TEXT,__text"]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: `#[link_section]` can be applied to functions, inherent methods, provided trait methods, statics, and trait methods in impl blocks
+   = help: `#[link_section]` can be applied to functions with a body and statics
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 error: `#[linkage]` attribute cannot be used on required trait methods
@@ -27,7 +27,7 @@ error: `#[linkage]` attribute cannot be used on required trait methods
 LL |     #[linkage = "common"]
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: `#[linkage]` can be applied to foreign functions, foreign statics, functions, inherent methods, provided trait methods, statics, and trait methods in impl blocks
+   = help: `#[linkage]` can be applied to foreign functions, foreign statics, functions with a body, and statics
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 error: aborting due to 3 previous errors
diff --git a/tests/ui/coverage-attr/allowed-positions.stderr b/tests/ui/coverage-attr/allowed-positions.stderr
@@ -46,15 +46,15 @@ error: `#[coverage]` attribute cannot be used on required trait methods
 LL |     #[coverage(off)]
    |     ^^^^^^^^^^^^^^^^
    |
-   = help: `#[coverage]` can be applied to closures, crates, functions, impl blocks, inherent methods, modules, provided trait methods, and trait methods in impl blocks
+   = help: `#[coverage]` can be applied to crates, functions with a body, impl blocks, and modules
 
 error: `#[coverage]` attribute cannot be used on required trait methods
   --> $DIR/allowed-positions.rs:31:5
    |
 LL |     #[coverage(off)]
    |     ^^^^^^^^^^^^^^^^
    |
-   = help: `#[coverage]` can be applied to closures, crates, functions, impl blocks, inherent methods, modules, provided trait methods, and trait methods in impl blocks
+   = help: `#[coverage]` can be applied to crates, functions with a body, impl blocks, and modules
 
 error: `#[coverage]` attribute cannot be used on associated types
   --> $DIR/allowed-positions.rs:39:5
@@ -110,7 +110,7 @@ error: `#[coverage]` attribute cannot be used on foreign functions
 LL |     #[coverage(off)]
    |     ^^^^^^^^^^^^^^^^
    |
-   = help: `#[coverage]` can be applied to closures, crates, functions, impl blocks, methods, and modules
+   = help: `#[coverage]` can be applied to crates, functions with a body, impl blocks, and modules
 
 error: `#[coverage]` attribute cannot be used on statements
   --> $DIR/allowed-positions.rs:88:5
diff --git a/tests/ui/extern/extern-no-mangle.stderr b/tests/ui/extern/extern-no-mangle.stderr
@@ -18,7 +18,7 @@ warning: `#[no_mangle]` attribute cannot be used on foreign functions
 LL |     #[no_mangle]
    |     ^^^^^^^^^^^^
    |
-   = help: `#[no_mangle]` can be applied to functions, methods, and statics
+   = help: `#[no_mangle]` can be applied to functions with a body and statics
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 warning: `#[no_mangle]` attribute cannot be used on statements
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
@@ -213,7 +213,7 @@ error: `#[export_name]` attribute cannot be used on required trait methods
 LL |         #[export_name = "2200"] fn foo();
    |         ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: `#[export_name]` can be applied to functions, inherent methods, provided trait methods, statics, and trait methods in impl blocks
+   = help: `#[export_name]` can be applied to functions with a body and statics
 
 error[E0517]: attribute should be applied to a struct, enum, or union
   --> $DIR/issue-43106-gating-of-builtin-attrs-error.rs:123:8
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
@@ -511,7 +511,7 @@ warning: `#[no_mangle]` attribute cannot be used on required trait methods
 LL |         #[no_mangle] fn foo();
    |         ^^^^^^^^^^^^
    |
-   = help: `#[no_mangle]` can be applied to functions, inherent methods, statics, and trait methods in impl blocks
+   = help: `#[no_mangle]` can be applied to functions with a body and statics
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 warning: `#[no_mangle]` attribute cannot be used on provided trait methods
@@ -923,7 +923,7 @@ warning: `#[link_section]` attribute cannot be used on required trait methods
 LL |         #[link_section = ",1800"]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: `#[link_section]` can be applied to functions, inherent methods, provided trait methods, statics, and trait methods in impl blocks
+   = help: `#[link_section]` can be applied to functions with a body and statics
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 warning: `#[must_use]` attribute cannot be used on modules
diff --git a/tests/ui/force-inlining/invalid.stderr b/tests/ui/force-inlining/invalid.stderr
@@ -134,7 +134,7 @@ error: `#[rustc_force_inline]` attribute cannot be used on foreign functions
 LL |     #[rustc_force_inline]
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: `#[rustc_force_inline]` can be applied to functions and inherent methods
+   = help: `#[rustc_force_inline]` can only be applied to functions with a body
 
 error: `#[rustc_force_inline]` attribute cannot be used on type aliases
   --> $DIR/invalid.rs:66:1
diff --git a/tests/ui/lint/warn-unused-inline-on-fn-prototypes.stderr b/tests/ui/lint/warn-unused-inline-on-fn-prototypes.stderr
@@ -4,7 +4,7 @@ error: `#[inline]` attribute cannot be used on required trait methods
 LL |     #[inline]
    |     ^^^^^^^^^
    |
-   = help: `#[inline]` can be applied to closures, functions, inherent methods, provided trait methods, and trait methods in impl blocks
+   = help: `#[inline]` can only be applied to functions with a body
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 note: the lint level is defined here
   --> $DIR/warn-unused-inline-on-fn-prototypes.rs:1:9
@@ -18,7 +18,7 @@ error: `#[inline]` attribute cannot be used on foreign functions
 LL |     #[inline]
    |     ^^^^^^^^^
    |
-   = help: `#[inline]` can be applied to closures, functions, and methods
+   = help: `#[inline]` can only be applied to functions with a body
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/sanitize-attr/valid-sanitize.stderr b/tests/ui/sanitize-attr/valid-sanitize.stderr
@@ -44,15 +44,15 @@ error: `#[sanitize]` attribute cannot be used on required trait methods
 LL |     #[sanitize(address = "off")]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: `#[sanitize]` can be applied to closures, crates, functions, impl blocks, inherent methods, modules, provided trait methods, statics, and trait methods in impl blocks
+   = help: `#[sanitize]` can be applied to crates, functions with a body, impl blocks, modules, and statics
 
 error: `#[sanitize]` attribute cannot be used on required trait methods
   --> $DIR/valid-sanitize.rs:35:5
    |
 LL |     #[sanitize(address = "off")]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: `#[sanitize]` can be applied to closures, crates, functions, impl blocks, inherent methods, modules, provided trait methods, statics, and trait methods in impl blocks
+   = help: `#[sanitize]` can be applied to crates, functions with a body, impl blocks, modules, and statics
 
 error: `#[sanitize]` attribute cannot be used on associated types
   --> $DIR/valid-sanitize.rs:43:5
@@ -108,7 +108,7 @@ error: `#[sanitize]` attribute cannot be used on foreign functions
 LL |     #[sanitize(address = "off", thread = "on")]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: `#[sanitize]` can be applied to closures, crates, functions, impl blocks, methods, modules, and statics
+   = help: `#[sanitize]` can be applied to crates, functions with a body, impl blocks, modules, and statics
 
 error: `#[sanitize]` attribute cannot be used on statements
   --> $DIR/valid-sanitize.rs:92:5

Original file line number	Diff line number	Diff line change
@@ -46,15 +46,15 @@ error: `#[coverage]` attribute cannot be used on required trait methods
`46`	`46`	`LL \| #[coverage(off)]`
`47`	`47`	`\| ^^^^^^^^^^^^^^^^`
`48`	`48`	`\|`
`49`		- = help: `#[coverage]` can be applied to closures, crates, functions, impl blocks, inherent methods, modules, provided trait methods, and trait methods in impl blocks
	`49`	+ = help: `#[coverage]` can be applied to crates, functions with a body, impl blocks, and modules
`50`	`50`
`51`	`51`	error: `#[coverage]` attribute cannot be used on required trait methods
`52`	`52`	`--> $DIR/allowed-positions.rs:31:5`
`53`	`53`	`\|`
`54`	`54`	`LL \| #[coverage(off)]`
`55`	`55`	`\| ^^^^^^^^^^^^^^^^`
`56`	`56`	`\|`
`57`		- = help: `#[coverage]` can be applied to closures, crates, functions, impl blocks, inherent methods, modules, provided trait methods, and trait methods in impl blocks
	`57`	+ = help: `#[coverage]` can be applied to crates, functions with a body, impl blocks, and modules
`58`	`58`
`59`	`59`	error: `#[coverage]` attribute cannot be used on associated types
`60`	`60`	`--> $DIR/allowed-positions.rs:39:5`
@@ -110,7 +110,7 @@ error: `#[coverage]` attribute cannot be used on foreign functions
`110`	`110`	`LL \| #[coverage(off)]`
`111`	`111`	`\| ^^^^^^^^^^^^^^^^`
`112`	`112`	`\|`
`113`		- = help: `#[coverage]` can be applied to closures, crates, functions, impl blocks, methods, and modules
	`113`	+ = help: `#[coverage]` can be applied to crates, functions with a body, impl blocks, and modules
`114`	`114`
`115`	`115`	error: `#[coverage]` attribute cannot be used on statements
`116`	`116`	`--> $DIR/allowed-positions.rs:88:5`
Original file line number	Diff line number	Diff line change
@@ -18,7 +18,7 @@ warning: `#[no_mangle]` attribute cannot be used on foreign functions
`18`	`18`	`LL \| #[no_mangle]`
`19`	`19`	`\| ^^^^^^^^^^^^`
`20`	`20`	`\|`
`21`		- = help: `#[no_mangle]` can be applied to functions, methods, and statics
	`21`	+ = help: `#[no_mangle]` can be applied to functions with a body and statics
`22`	`22`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`23`	`23`
`24`	`24`	warning: `#[no_mangle]` attribute cannot be used on statements
Original file line number	Diff line number	Diff line change
@@ -213,7 +213,7 @@ error: `#[export_name]` attribute cannot be used on required trait methods
`213`	`213`	`LL \| #[export_name = "2200"] fn foo();`
`214`	`214`	`\| ^^^^^^^^^^^^^^^^^^^^^^^`
`215`	`215`	`\|`
`216`		- = help: `#[export_name]` can be applied to functions, inherent methods, provided trait methods, statics, and trait methods in impl blocks
	`216`	+ = help: `#[export_name]` can be applied to functions with a body and statics
`217`	`217`
`218`	`218`	`error[E0517]: attribute should be applied to a struct, enum, or union`
`219`	`219`	`--> $DIR/issue-43106-gating-of-builtin-attrs-error.rs:123:8`
Original file line number	Diff line number	Diff line change
@@ -134,7 +134,7 @@ error: `#[rustc_force_inline]` attribute cannot be used on foreign functions
`134`	`134`	`LL \| #[rustc_force_inline]`
`135`	`135`	`\| ^^^^^^^^^^^^^^^^^^^^^`
`136`	`136`	`\|`
`137`		- = help: `#[rustc_force_inline]` can be applied to functions and inherent methods
	`137`	+ = help: `#[rustc_force_inline]` can only be applied to functions with a body
`138`	`138`
`139`	`139`	error: `#[rustc_force_inline]` attribute cannot be used on type aliases
`140`	`140`	`--> $DIR/invalid.rs:66:1`
Original file line number	Diff line number	Diff line change
@@ -44,15 +44,15 @@ error: `#[sanitize]` attribute cannot be used on required trait methods
`44`	`44`	`LL \| #[sanitize(address = "off")]`
`45`	`45`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`46`	`46`	`\|`
`47`		- = help: `#[sanitize]` can be applied to closures, crates, functions, impl blocks, inherent methods, modules, provided trait methods, statics, and trait methods in impl blocks
	`47`	+ = help: `#[sanitize]` can be applied to crates, functions with a body, impl blocks, modules, and statics
`48`	`48`
`49`	`49`	error: `#[sanitize]` attribute cannot be used on required trait methods
`50`	`50`	`--> $DIR/valid-sanitize.rs:35:5`
`51`	`51`	`\|`
`52`	`52`	`LL \| #[sanitize(address = "off")]`
`53`	`53`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`54`	`54`	`\|`
`55`		- = help: `#[sanitize]` can be applied to closures, crates, functions, impl blocks, inherent methods, modules, provided trait methods, statics, and trait methods in impl blocks
	`55`	+ = help: `#[sanitize]` can be applied to crates, functions with a body, impl blocks, modules, and statics
`56`	`56`
`57`	`57`	error: `#[sanitize]` attribute cannot be used on associated types
`58`	`58`	`--> $DIR/valid-sanitize.rs:43:5`
@@ -108,7 +108,7 @@ error: `#[sanitize]` attribute cannot be used on foreign functions
`108`	`108`	`LL \| #[sanitize(address = "off", thread = "on")]`
`109`	`109`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`110`	`110`	`\|`
`111`		- = help: `#[sanitize]` can be applied to closures, crates, functions, impl blocks, methods, modules, and statics
	`111`	+ = help: `#[sanitize]` can be applied to crates, functions with a body, impl blocks, modules, and statics
`112`	`112`
`113`	`113`	error: `#[sanitize]` attribute cannot be used on statements
`114`	`114`	`--> $DIR/valid-sanitize.rs:92:5`