wip

Author: JonathanBrouwer

compiler/rustc_attr_parsing/src/attributes/lint_helpers.rs

@@ -3,7 +3,7 @@ use rustc_hir::{MethodKind, Target};
 use rustc_span::{Span, Symbol, sym};
 
 use crate::attributes::{NoArgsAttributeParser, OnDuplicate};
-use crate::context::MaybeWarn::Allow;
+use crate::context::MaybeWarn::{Allow, Error};
 use crate::context::{AllowedTargets, Stage};
 pub(crate) struct AsPtrParser;
 impl<S: Stage> NoArgsAttributeParser<S> for AsPtrParser {
@@ -47,7 +47,10 @@ pub(crate) struct AutomaticallyDerivedParser;
 impl<S: Stage> NoArgsAttributeParser<S> for AutomaticallyDerivedParser {
     const PATH: &[Symbol] = &[sym::automatically_derived];
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
-    const ALLOWED_TARGETS: AllowedTargets =
-        AllowedTargets::AllowListWarnRest(&[Allow(Target::Impl { of_trait: true })]);
+    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowListWarnRest(&[
+        Allow(Target::Impl { of_trait: true }),
+        Error(Target::Crate),
+        Error(Target::WherePredicate),
+    ]);
     const CREATE: fn(Span) -> AttributeKind = AttributeKind::AutomaticallyDerived;
 }

compiler/rustc_attr_parsing/src/attributes/path.rs

@@ -4,7 +4,7 @@ use rustc_hir::attrs::AttributeKind;
 use rustc_span::{Symbol, sym};
 
 use crate::attributes::{AttributeOrder, OnDuplicate, SingleAttributeParser};
-use crate::context::MaybeWarn::Allow;
+use crate::context::MaybeWarn::{Allow, Error};
 use crate::context::{AcceptContext, AllowedTargets, Stage};
 use crate::parser::ArgParser;
 pub(crate) struct PathParser;
@@ -14,7 +14,7 @@ impl<S: Stage> SingleAttributeParser<S> for PathParser {
     const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepOutermost;
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::WarnButFutureError;
     const ALLOWED_TARGETS: AllowedTargets =
-        AllowedTargets::AllowListWarnRest(&[Allow(Target::Mod)]);
+        AllowedTargets::AllowListWarnRest(&[Allow(Target::Mod), Error(Target::Crate)]);
     const TEMPLATE: AttributeTemplate = template!(NameValueStr: "file");
 
     fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {

compiler/rustc_attr_parsing/src/attributes/proc_macro_attrs.rs

@@ -33,7 +33,8 @@ impl<S: Stage> SingleAttributeParser<S> for ProcMacroDeriveParser {
     const PATH: &[Symbol] = &[sym::proc_macro_derive];
     const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepOutermost;
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
-    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowListWarnRest(&[Allow(Target::Fn)]);
+    const ALLOWED_TARGETS: AllowedTargets =
+        AllowedTargets::AllowList(&[Allow(Target::Fn), Warn(Target::Crate)]);
     const TEMPLATE: AttributeTemplate =
         template!(List: "TraitName, /*opt*/ attributes(name1, name2, ...)");
 

compiler/rustc_attr_parsing/src/attributes/test_attrs.rs

@@ -5,7 +5,7 @@ use rustc_hir::lints::AttributeLintKind;
 use rustc_span::{Symbol, sym};
 
 use crate::attributes::{AttributeOrder, OnDuplicate, SingleAttributeParser};
-use crate::context::MaybeWarn::Allow;
+use crate::context::MaybeWarn::{Allow, Error};
 use crate::context::{AcceptContext, AllowedTargets, Stage};
 use crate::parser::ArgParser;
 pub(crate) struct IgnoreParser;
@@ -14,7 +14,8 @@ impl<S: Stage> SingleAttributeParser<S> for IgnoreParser {
     const PATH: &[Symbol] = &[sym::ignore];
     const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepOutermost;
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
-    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowListWarnRest(&[Allow(Target::Fn)]);
+    const ALLOWED_TARGETS: AllowedTargets =
+        AllowedTargets::AllowListWarnRest(&[Allow(Target::Fn), Error(Target::WherePredicate)]);
     const TEMPLATE: AttributeTemplate = template!(Word, NameValueStr: "reason");
 
     fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {

tests/ui/lint/unused/unused-attr-macro-rules.stderr

@@ -1,9 +1,3 @@
-error: this attribute is not allowed on this target
-  --> $DIR/unused-attr-macro-rules.rs:8:3
-   |
-LL | #[path="foo"]
-   |   ^^^^^^^^^^
-
 error: crate-level attribute should be an inner attribute: add an exclamation mark: `#![foo]`
   --> $DIR/unused-attr-macro-rules.rs:9:1
    |
@@ -22,5 +16,11 @@ error: this attribute is not allowed on this target
 LL | #[macro_use]
    |   ^^^^^^^^^
 
+error: this attribute is not allowed on this target
+  --> $DIR/unused-attr-macro-rules.rs:8:3
+   |
+LL | #[path="foo"]
+   |   ^^^^^^^^^^
+
 error: aborting due to 3 previous errors
 

tests/ui/resolve/path-attr-in-const-block.rs

@@ -6,6 +6,5 @@ fn main() {
         #![path = foo!()]
         //~^ ERROR: cannot find macro `foo` in this scope
         //~| ERROR malformed `path` attribute input
-        //~| ERROR this attribute is not allowed on this target
     }
 }

tests/ui/resolve/path-attr-in-const-block.stderr

@@ -13,12 +13,6 @@ LL |         #![path = foo!()]
    |         |         expected a string literal here
    |         help: must be of the form: `#[path = "file"]`
 
-error: this attribute is not allowed on this target
-  --> $DIR/path-attr-in-const-block.rs:6:12
-   |
-LL |         #![path = foo!()]
-   |            ^^^^^^^^^^^^^
-
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0539`.