wip

Author: JonathanBrouwer

compiler/rustc_ast_lowering/src/item.rs

@@ -826,7 +826,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
             hir_id,
             &i.attrs,
             i.span,
-            Target::from_assoc_item_kind(&i.kind, false),
+            Target::from_assoc_item_kind(&i.kind, AssocCtxt::Trait),
         );
         let trait_item_def_id = hir_id.expect_owner();
 
@@ -1002,7 +1002,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
             hir_id,
             &i.attrs,
             i.span,
-            Target::from_assoc_item_kind(&i.kind, is_in_trait_impl),
+            Target::from_assoc_item_kind(&i.kind, AssocCtxt::Impl { of_trait: is_in_trait_impl }),
         );
 
         let (ident, (generics, kind)) = match &i.kind {

compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs

@@ -435,6 +435,7 @@ impl<S: Stage> CombineAttributeParser<S> for TargetFeatureParser {
     const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
         Allow(Target::Fn),
         Allow(Target::Method(MethodKind::Inherent)),
+        Allow(Target::Method(MethodKind::Trait {body: true})),
         Warn(Target::Statement),
         Warn(Target::Field),
         Warn(Target::Arm),

compiler/rustc_attr_parsing/src/attributes/deprecation.rs

@@ -5,7 +5,7 @@ use rustc_span::{Span, Symbol, sym};
 
 use super::util::parse_version;
 use super::{AttributeOrder, OnDuplicate, SingleAttributeParser};
-use crate::context::MaybeWarn::{Allow, Warn};
+use crate::context::MaybeWarn::{Allow};
 use crate::context::{AcceptContext, AllowedTargets, Stage};
 use crate::parser::ArgParser;
 use crate::session_diagnostics;
@@ -39,7 +39,7 @@ impl<S: Stage> SingleAttributeParser<S> for DeprecationParser {
     const PATH: &[Symbol] = &[sym::deprecated];
     const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepInnermost;
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
-    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
+    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowListWarnRest(&[
         Allow(Target::Fn),
         Allow(Target::Mod),
         Allow(Target::Struct),
@@ -58,15 +58,6 @@ impl<S: Stage> SingleAttributeParser<S> for DeprecationParser {
         Allow(Target::AssocTy),
         Allow(Target::AssocConst),
         Allow(Target::Variant),
-        Warn(Target::Expression),
-        Warn(Target::Impl { of_trait: false }),
-        Warn(Target::Impl { of_trait: true }),
-        Warn(Target::Crate),
-        Warn(Target::Param),
-        Warn(Target::Closure),
-        Warn(Target::Expression),
-        Warn(Target::Statement),
-        Warn(Target::Arm),
     ]);
     const TEMPLATE: AttributeTemplate = template!(
         Word,

compiler/rustc_attr_parsing/src/attributes/lint_helpers.rs

@@ -34,7 +34,7 @@ pub(crate) struct PassByValueParser;
 impl<S: Stage> NoArgsAttributeParser<S> for PassByValueParser {
     const PATH: &[Symbol] = &[sym::rustc_pass_by_value];
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
-    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Struct)]);
+    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Struct), Allow(Target::Enum), Allow(Target::TyAlias)]);
     const CREATE: fn(Span) -> AttributeKind = AttributeKind::PassByValue;
 }
 

compiler/rustc_attr_parsing/src/attributes/traits.rs

@@ -172,6 +172,6 @@ pub(crate) struct PointeeParser;
 impl<S: Stage> NoArgsAttributeParser<S> for PointeeParser {
     const PATH: &[Symbol] = &[sym::pointee];
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
-    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Param)]);
+    const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowAll; //TODO
     const CREATE: fn(Span) -> AttributeKind = AttributeKind::Pointee;
 }

compiler/rustc_builtin_macros/messages.ftl

@@ -259,8 +259,6 @@ builtin_macros_only_one_argument = {$name} takes 1 argument
 
 builtin_macros_proc_macro = `proc-macro` crate types currently cannot export any items other than functions tagged with `#[proc_macro]`, `#[proc_macro_derive]`, or `#[proc_macro_attribute]`
 
-builtin_macros_proc_macro_attribute_only_be_used_on_bare_functions = the `#[{$path}]` attribute may only be used on bare functions
-
 builtin_macros_proc_macro_attribute_only_usable_with_crate_type = the `#[{$path}]` attribute is only usable with crates of the `proc-macro` crate type
 
 builtin_macros_requires_cfg_pattern =

compiler/rustc_builtin_macros/src/errors.rs

@@ -905,14 +905,6 @@ pub(crate) struct TakesNoArguments<'a> {
     pub name: &'a str,
 }
 
-#[derive(Diagnostic)]
-#[diag(builtin_macros_proc_macro_attribute_only_be_used_on_bare_functions)]
-pub(crate) struct AttributeOnlyBeUsedOnBareFunctions<'a> {
-    #[primary_span]
-    pub span: Span,
-    pub path: &'a str,
-}
-
 #[derive(Diagnostic)]
 #[diag(builtin_macros_proc_macro_attribute_only_usable_with_crate_type)]
 pub(crate) struct AttributeOnlyUsableWithCrateType<'a> {

compiler/rustc_builtin_macros/src/proc_macro_harness.rs

@@ -232,12 +232,7 @@ impl<'a> Visitor<'a> for CollectProcMacros<'a> {
         let fn_ident = if let ast::ItemKind::Fn(fn_) = &item.kind {
             fn_.ident
         } else {
-            self.dcx
-                .create_err(errors::AttributeOnlyBeUsedOnBareFunctions {
-                    span: attr.span,
-                    path: &pprust::path_to_string(&attr.get_normal_item().path),
-                })
-                .emit();
+            // Error handled by general target checking logic
             return;
         };
 

compiler/rustc_error_codes/src/error_codes/E0518.md

@@ -1,9 +1,11 @@
+#### Note: this error code is no longer emitted by the compiler.
+
 An `#[inline(..)]` attribute was incorrectly placed on something other than a
 function or method.
 
 Example of erroneous code:
 
-```compile_fail,E0518
+```ignore (no longer emitted)
 #[inline(always)]
 struct Foo;
 

compiler/rustc_hir/src/target.rs

@@ -7,7 +7,7 @@
 use std::fmt::{self, Display};
 
 use rustc_ast::{AssocItemKind, ForeignItemKind, ast};
-
+use rustc_ast::visit::AssocCtxt;
 use crate::def::DefKind;
 use crate::{Item, ItemKind, TraitItem, TraitItemKind, hir};
 
@@ -226,13 +226,16 @@ impl Target {
         }
     }
 
-    pub fn from_assoc_item_kind(kind: &ast::AssocItemKind, is_in_trait_impl: bool) -> Target {
+    pub fn from_assoc_item_kind(kind: &ast::AssocItemKind, assoc_ctxt: AssocCtxt) -> Target {
         match kind {
             AssocItemKind::Const(_) => Target::AssocConst,
-            AssocItemKind::Fn(_) => Target::Method(if is_in_trait_impl {
-                MethodKind::Trait { body: true }
-            } else {
-                MethodKind::Inherent
+            AssocItemKind::Fn(f) => Target::Method(match assoc_ctxt {
+                AssocCtxt::Trait => MethodKind::Trait { body: f.body.is_some() },
+                AssocCtxt::Impl { of_trait } => if of_trait {
+                    MethodKind::Trait { body: true }
+                } else {
+                    MethodKind::Inherent
+                }
             }),
             AssocItemKind::Type(_) => Target::AssocTy,
             AssocItemKind::Delegation(_) => Target::Delegation,