wip

Author: JonathanBrouwer

compiler/rustc_attr_parsing/src/attributes/stability.rs

@@ -33,6 +33,8 @@ const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
     Allow(Target::Enum),
     Allow(Target::Union),
     Allow(Target::Method(MethodKind::Inherent)),
+    Allow(Target::Method(MethodKind::Trait {body: false})),
+    Allow(Target::Method(MethodKind::Trait {body: true})),
     Allow(Target::Impl { of_trait: false }),
     Allow(Target::Impl { of_trait: true }),
     Allow(Target::MacroDef),

tests/ui/traits/alias/not-a-marker.rs

@@ -1,7 +1,7 @@
 #![feature(trait_alias, marker_trait_attr)]
 
 #[marker]
-//~^ ERROR attribute should be applied to a trait
+//~^ ERROR this attribute is not allowed on this target
 trait Foo = Send;
 
 fn main() {}

tests/ui/traits/const-traits/attr-misuse.rs

@@ -2,9 +2,9 @@
 
 #[const_trait]
 trait A {
-    #[const_trait] //~ ERROR attribute should be applied
+    #[const_trait] //~ ERROR this attribute is not allowed on this target
     fn foo(self);
 }
 
-#[const_trait] //~ ERROR attribute should be applied
+#[const_trait] //~ ERROR this attribute is not allowed on this target
 fn main() {}

tests/ui/traits/const-traits/attr-misuse.stderr

@@ -1,18 +1,14 @@
-error: attribute should be applied to a trait
-  --> $DIR/attr-misuse.rs:9:1
+error: this attribute is not allowed on this target
+  --> $DIR/attr-misuse.rs:5:7
    |
-LL | #[const_trait]
-   | ^^^^^^^^^^^^^^
-LL | fn main() {}
-   | ------------ not a trait
+LL |     #[const_trait]
+   |       ^^^^^^^^^^^
 
-error: attribute should be applied to a trait
-  --> $DIR/attr-misuse.rs:5:5
+error: this attribute is not allowed on this target
+  --> $DIR/attr-misuse.rs:9:3
    |
-LL |     #[const_trait]
-   |     ^^^^^^^^^^^^^^
-LL |     fn foo(self);
-   |     ------------- not a trait
+LL | #[const_trait]
+   |   ^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 

tests/ui/unstable-feature-bound/unstable_inherent_method.rs

@@ -9,14 +9,14 @@
 pub trait Trait {
     #[unstable(feature = "feat", issue = "none" )]
     #[unstable_feature_bound(foo)]
-    //~^ ERROR: attribute should be applied to `impl` or free function outside of any `impl` or trait
+    //~^ ERROR: this attribute is not allowed on this target
     fn foo();
 }
 
 #[stable(feature = "a", since = "1.1.1" )]
 impl Trait for u8 {
     #[unstable_feature_bound(foo)]
-    //~^ ERROR: attribute should be applied to `impl` or free function outside of any `impl` or trait
+    //~^ ERROR: this attribute is not allowed on this target
     fn foo() {}
 }
 

tests/ui/unstable-feature-bound/unstable_inherent_method.stderr

@@ -1,20 +1,14 @@
-error: attribute should be applied to `impl` or free function outside of any `impl` or trait
-  --> $DIR/unstable_inherent_method.rs:11:5
+error: this attribute is not allowed on this target
+  --> $DIR/unstable_inherent_method.rs:11:7
    |
 LL |     #[unstable_feature_bound(foo)]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-LL |
-LL |     fn foo();
-   |     --------- not an `impl` or free function
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: attribute should be applied to `impl` or free function outside of any `impl` or trait
-  --> $DIR/unstable_inherent_method.rs:18:5
+error: this attribute is not allowed on this target
+  --> $DIR/unstable_inherent_method.rs:18:7
    |
 LL |     #[unstable_feature_bound(foo)]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-LL |
-LL |     fn foo() {}
-   |     ----------- not an `impl` or free function
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 

tests/ui/where-clauses/unsupported_attribute.stderr

@@ -10,6 +10,30 @@ error: expected non-macro attribute, found attribute macro `derive`
 LL |     #[derive(Clone)] 'a: 'static,
    |       ^^^^^^ not a non-macro attribute
 
+error: this attribute is not allowed on this target
+  --> $DIR/unsupported_attribute.rs:16:7
+   |
+LL |     #[ignore] T: Trait,
+   |       ^^^^^^
+
+error: this attribute is not allowed on this target
+  --> $DIR/unsupported_attribute.rs:17:7
+   |
+LL |     #[ignore] 'a: 'static,
+   |       ^^^^^^
+
+error: this attribute is not allowed on this target
+  --> $DIR/unsupported_attribute.rs:26:7
+   |
+LL |     #[automatically_derived] T: Trait,
+   |       ^^^^^^^^^^^^^^^^^^^^^
+
+error: this attribute is not allowed on this target
+  --> $DIR/unsupported_attribute.rs:27:7
+   |
+LL |     #[automatically_derived] 'a: 'static,
+   |       ^^^^^^^^^^^^^^^^^^^^^
+
 error: most attributes are not supported in `where` clauses
   --> $DIR/unsupported_attribute.rs:14:5
    |
@@ -154,5 +178,5 @@ LL |     #[rustfmt::skip] 'a: 'static,
    |
    = help: only `#[cfg]` and `#[cfg_attr]` are supported
 
-error: aborting due to 20 previous errors
+error: aborting due to 24 previous errors