wip

Signed-off-by: Jonathan Brouwer <[email protected]>

Author: JonathanBrouwer

compiler/rustc_ast_lowering/src/item.rs

@@ -6,7 +6,7 @@ use rustc_errors::{E0570, ErrorGuaranteed, struct_span_code_err};
 use rustc_hir::attrs::AttributeKind;
 use rustc_hir::def::{DefKind, PerNS, Res};
 use rustc_hir::def_id::{CRATE_DEF_ID, LocalDefId};
-use rustc_hir::{self as hir, HirId, LifetimeSource, PredicateOrigin, Target, find_attr};
+use rustc_hir::{self as hir, HirId, LifetimeSource, PredicateOrigin, Target, find_attr, MethodKind};
 use rustc_index::{IndexSlice, IndexVec};
 use rustc_middle::span_bug;
 use rustc_middle::ty::{ResolverAstLowering, TyCtxt};
@@ -822,6 +822,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
 
     fn lower_trait_item(&mut self, i: &AssocItem) -> &'hir hir::TraitItem<'hir> {
         let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id);
+        Target::from_trait_item(&i.kind) //TODO
         let attrs = self.lower_attrs(hir_id, &i.attrs, i.span, Target::Trait);
         let trait_item_def_id = hir_id.expect_owner();
 
@@ -993,8 +994,18 @@ impl<'hir> LoweringContext<'_, 'hir> {
         let has_value = true;
         let (defaultness, _) = self.lower_defaultness(i.kind.defaultness(), has_value);
         let hir_id = hir::HirId::make_owner(self.current_hir_id_owner.def_id);
+        let target = match i.kind {
+            AssocItemKind::Const(_) => Target::AssocConst,
+            AssocItemKind::Fn(_) => Target::Method(if is_in_trait_impl {
+                MethodKind::Trait { body: true }
+            } else {
+                MethodKind::Inherent
+            }),
+            AssocItemKind::Type(_) => Target::AssocTy,
+            _ => unreachable!(),
+        };
         let attrs =
-            self.lower_attrs(hir_id, &i.attrs, i.span, Target::from_ast_item()); //TODO this is not correct
+            self.lower_attrs(hir_id, &i.attrs, i.span, target); //TODO this is not correct
 
         let (ident, (generics, kind)) = match &i.kind {
             AssocItemKind::Const(box ConstItem {

compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs

@@ -56,7 +56,7 @@ pub(crate) struct ColdParser;
 impl<S: Stage> NoArgsAttributeParser<S> for ColdParser {
     const PATH: &[Symbol] = &[sym::cold];
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
-    const ALLOWED_TARGETS: &'static [Target] = &[Target::Fn];
+    const ALLOWED_TARGETS: &'static [Target] = &[Target::Fn, Target::Method(MethodKind::Trait { body: true }), Target::Method(MethodKind::Inherent)];
     const CREATE: fn(Span) -> AttributeKind = AttributeKind::Cold;
 }
 
@@ -250,7 +250,7 @@ pub(crate) struct TrackCallerParser;
 impl<S: Stage> NoArgsAttributeParser<S> for TrackCallerParser {
     const PATH: &[Symbol] = &[sym::track_caller];
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
-    const ALLOWED_TARGETS: &'static [Target] = &[Target::Fn, Target::Method(MethodKind::Inherent)];
+    const ALLOWED_TARGETS: &'static [Target] = &[Target::Fn, Target::Method(MethodKind::Inherent), Target::Method(MethodKind::Trait { body: true })];
     const CREATE: fn(Span) -> AttributeKind = AttributeKind::TrackCaller;
 }
 

compiler/rustc_attr_parsing/src/attributes/deprecation.rs

@@ -1,5 +1,5 @@
 use rustc_feature::{AttributeTemplate, template};
-use rustc_hir::Target;
+use rustc_hir::{MethodKind, Target};
 use rustc_hir::attrs::{AttributeKind, DeprecatedSince, Deprecation};
 use rustc_span::{Span, Symbol, sym};
 
@@ -48,6 +48,7 @@ impl<S: Stage> SingleAttributeParser<S> for DeprecationParser {
         Target::Const,
         Target::Static,
         Target::MacroDef,
+        Target::Method(MethodKind::Inherent),
     ];
     const TEMPLATE: AttributeTemplate = template!(
         Word,

compiler/rustc_attr_parsing/src/attributes/repr.rs

@@ -60,7 +60,7 @@ impl<S: Stage> CombineAttributeParser<S> for ReprParser {
         reprs
     }
 
-    const ALLOWED_TARGETS: &'static [Target] = &[Target::Struct, Target::Enum];
+    const ALLOWED_TARGETS: &'static [Target] = &[Target::Struct, Target::Enum, Target::Union];
 }
 
 macro_rules! int_pat {

compiler/rustc_attr_parsing/src/attributes/stability.rs

@@ -29,12 +29,16 @@ macro_rules! reject_outside_std {
 const ALLOWED_TARGETS: &[Target] = &[Target::Fn,
     Target::Struct,
     Target::Method(MethodKind::Inherent),
+    Target::Impl { of_trait: false },
     Target::Impl { of_trait: true },
     Target::MacroDef,
     Target::Crate,
     Target::Mod,
     Target::Use,
-    Target::Const
+    Target::Const,
+    Target::AssocConst,
+    Target::Trait,
+    Target::TraitAlias,
 ];
 
 #[derive(Default)]

compiler/rustc_attr_parsing/src/context.rs

@@ -852,7 +852,7 @@ impl<'sess, S: Stage> AttributeParser<'sess, S> {
                         (accept.accept_fn)(&mut cx, args);
 
                         if self.stage.should_emit().should_emit() && !accept.allowed_targets.contains(&target) {
-                            if parts == &[sym::unstable] && target == (Target::Impl { of_trait: false}) {
+                            if parts == &[sym::must_use] && target == (Target::Trait) {
                                 panic!();
                             }