Add warning for a parameter list with an attribute but no parameters

rust-lang · Feb 7, 2019 · 9ad04b9 · 9ad04b9
1 parent dbc7924
commit 9ad04b9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -5545,13 +5545,25 @@ impl<'a> Parser<'a> {
                 params.push(self.parse_ty_param(attrs)?);
             } else {
                 // Check for trailing attributes and stop parsing.
-                if !attrs.is_empty() && !params.is_empty() {
-                    self.struct_span_err(
-                        attrs[0].span,
-                        &format!("trailing attribute after generic parameter"),
-                    )
-                    .span_label(attrs[0].span, "attributes must go before parameters")
-                    .emit();
+                if !attrs.is_empty() {
+                    if !params.is_empty() {
+                        self.struct_span_err(
+                            attrs[0].span,
+                            &format!("trailing attribute after generic parameter"),
+                        )
+                        .span_label(attrs[0].span, "attributes must go before parameters")
+                        .emit();
+                    } else {
+                        self.struct_span_err(
+                            attrs[0].span,
+                            &format!("attribute without generic parameters"),
+                        )
+                        .span_label(
+                            attrs[0].span,
+                            "attributes are only permitted when preceding parameters",
+                        )
+                        .emit();
+                    }
                 }
                 break
             }

diff --git a/src/test/ui/attribute-with-no-generics-in-parameter-list.rs b/src/test/ui/attribute-with-no-generics-in-parameter-list.rs
@@ -1,5 +1,3 @@
-// run-pass
-
-fn foo<#[attr]>() {} // ok
+fn foo<#[attr]>() {} //~ ERROR attribute without generic parameters
 
 fn main() {}
diff --git a/src/test/ui/attribute-with-no-generics-in-parameter-list.stderr b/src/test/ui/attribute-with-no-generics-in-parameter-list.stderr
@@ -0,0 +1,8 @@
+error: attribute without generic parameters
+  --> $DIR/attribute-with-no-generics-in-parameter-list.rs:1:8
+   |
+LL | fn foo<#[attr]>() {} //~ ERROR attribute without generic parameters
+   |        ^^^^^^^ attributes are only permitted when preceding parameters
+
+error: aborting due to previous error
+