Properly check arguments of #[coverage]

Author: JonathanBrouwer

compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs

@@ -80,7 +80,7 @@ impl<S: Stage> SingleAttributeParser<S> for CoverageParser {
         let mut fail_incorrect_argument =
             |span| cx.adcx().expected_specific_argument(span, &[sym::on, sym::off]);
 
-        let Some(arg) = arg.meta_item() else {
+        let Some(arg) = arg.meta_item_no_args() else {
             fail_incorrect_argument(arg.span());
             return None;
         };

tests/ui/attributes/args-checked.rs

@@ -1,5 +1,6 @@
 #![feature(rustc_attrs)]
 #![feature(optimize_attribute)]
+#![feature(coverage_attribute)]
 #![allow(unused_attributes)]
 
 #[inline(always = 5)]
@@ -14,6 +15,10 @@
 //~^ ERROR malformed
 #[optimize(size(x, y, z))]
 //~^ ERROR malformed
+#[coverage(off = 5)]
+//~^ ERROR malformed
+#[coverage(off(x, y, z))]
+//~^ ERROR malformed
 fn main() {
 
 }

tests/ui/attributes/args-checked.stderr

@@ -1,5 +1,5 @@
 error[E0539]: malformed `inline` attribute input
-  --> $DIR/args-checked.rs:5:1
+  --> $DIR/args-checked.rs:6:1
    |
 LL | #[inline(always = 5)]
    | ^^^^^^^^^----------^^
@@ -20,7 +20,7 @@ LL + #[inline]
    |
 
 error[E0539]: malformed `inline` attribute input
-  --> $DIR/args-checked.rs:7:1
+  --> $DIR/args-checked.rs:8:1
    |
 LL | #[inline(always(x, y, z))]
    | ^^^^^^^^^---------------^^
@@ -41,7 +41,7 @@ LL + #[inline]
    |
 
 error[E0539]: malformed `instruction_set` attribute input
-  --> $DIR/args-checked.rs:9:1
+  --> $DIR/args-checked.rs:10:1
    |
 LL | #[instruction_set(arm::a32 = 5)]
    | ^^^^^^^^^^^^^^^^^^------------^^
@@ -52,7 +52,7 @@ LL | #[instruction_set(arm::a32 = 5)]
    = note: for more information, visit <https://doc.rust-lang.org/reference/attributes/codegen.html#the-instruction_set-attribute>
 
 error[E0539]: malformed `instruction_set` attribute input
-  --> $DIR/args-checked.rs:11:1
+  --> $DIR/args-checked.rs:12:1
    |
 LL | #[instruction_set(arm::a32(x, y, z))]
    | ^^^^^^^^^^^^^^^^^^-----------------^^
@@ -63,7 +63,7 @@ LL | #[instruction_set(arm::a32(x, y, z))]
    = note: for more information, visit <https://doc.rust-lang.org/reference/attributes/codegen.html#the-instruction_set-attribute>
 
 error[E0539]: malformed `optimize` attribute input
-  --> $DIR/args-checked.rs:13:1
+  --> $DIR/args-checked.rs:14:1
    |
 LL | #[optimize(size = 5)]
    | ^^^^^^^^^^^--------^^
@@ -83,7 +83,7 @@ LL + #[optimize(speed)]
    |
 
 error[E0539]: malformed `optimize` attribute input
-  --> $DIR/args-checked.rs:15:1
+  --> $DIR/args-checked.rs:16:1
    |
 LL | #[optimize(size(x, y, z))]
    | ^^^^^^^^^^^-------------^^
@@ -102,20 +102,54 @@ LL - #[optimize(size(x, y, z))]
 LL + #[optimize(speed)]
    |
 
+error[E0539]: malformed `coverage` attribute input
+  --> $DIR/args-checked.rs:18:1
+   |
+LL | #[coverage(off = 5)]
+   | ^^^^^^^^^^^-------^^
+   |            |
+   |            valid arguments are `on` or `off`
+   |
+help: try changing it to one of the following valid forms of the attribute
+   |
+LL - #[coverage(off = 5)]
+LL + #[coverage(off)]
+   |
+LL - #[coverage(off = 5)]
+LL + #[coverage(on)]
+   |
+
+error[E0539]: malformed `coverage` attribute input
+  --> $DIR/args-checked.rs:20:1
+   |
+LL | #[coverage(off(x, y, z))]
+   | ^^^^^^^^^^^------------^^
+   |            |
+   |            valid arguments are `on` or `off`
+   |
+help: try changing it to one of the following valid forms of the attribute
+   |
+LL - #[coverage(off(x, y, z))]
+LL + #[coverage(off)]
+   |
+LL - #[coverage(off(x, y, z))]
+LL + #[coverage(on)]
+   |
+
 error: `rustc_allow_const_fn_unstable` expects feature names
-  --> $DIR/args-checked.rs:31:33
+  --> $DIR/args-checked.rs:36:33
    |
 LL | #[rustc_allow_const_fn_unstable(x = 5)]
    |                                 ^^^^^
 
 error: `rustc_allow_const_fn_unstable` expects feature names
-  --> $DIR/args-checked.rs:33:33
+  --> $DIR/args-checked.rs:38:33
    |
 LL | #[rustc_allow_const_fn_unstable(x(x, y, z))]
    |                                 ^^^^^^^^^^
 
 error: valid forms for the attribute are `#[macro_export(local_inner_macros)]` and `#[macro_export]`
-  --> $DIR/args-checked.rs:21:1
+  --> $DIR/args-checked.rs:26:1
    |
 LL | #[macro_export(local_inner_macros = 5)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -125,20 +159,20 @@ LL | #[macro_export(local_inner_macros = 5)]
    = note: `#[deny(invalid_macro_export_arguments)]` (part of `#[deny(future_incompatible)]`) on by default
 
 error: valid forms for the attribute are `#[macro_export(local_inner_macros)]` and `#[macro_export]`
-  --> $DIR/args-checked.rs:24:1
+  --> $DIR/args-checked.rs:29:1
    |
 LL | #[macro_export(local_inner_macros(x, y, z))]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
 
-error: aborting due to 10 previous errors
+error: aborting due to 12 previous errors
 
 For more information about this error, try `rustc --explain E0539`.
 Future incompatibility report: Future breakage diagnostic:
 error: valid forms for the attribute are `#[macro_export(local_inner_macros)]` and `#[macro_export]`
-  --> $DIR/args-checked.rs:21:1
+  --> $DIR/args-checked.rs:26:1
    |
 LL | #[macro_export(local_inner_macros = 5)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -149,7 +183,7 @@ LL | #[macro_export(local_inner_macros = 5)]
 
 Future breakage diagnostic:
 error: valid forms for the attribute are `#[macro_export(local_inner_macros)]` and `#[macro_export]`
-  --> $DIR/args-checked.rs:24:1
+  --> $DIR/args-checked.rs:29:1
    |
 LL | #[macro_export(local_inner_macros(x, y, z))]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^