WIP

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, MethodKind};
+use rustc_hir::{self as hir, HirId, LifetimeSource, PredicateOrigin, Target, find_attr};
 use rustc_index::{IndexSlice, IndexVec};
 use rustc_middle::span_bug;
 use rustc_middle::ty::{ResolverAstLowering, TyCtxt};
@@ -822,8 +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 attrs = self.lower_attrs(hir_id, &i.attrs, i.span, Target::from_assoc_item_kind(&i.kind, false));
         let trait_item_def_id = hir_id.expect_owner();
 
         let (ident, generics, kind, has_default) = match &i.kind {
@@ -994,18 +993,8 @@ 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); //TODO this is not correct
+            self.lower_attrs(hir_id, &i.attrs, i.span, Target::from_assoc_item_kind(&i.kind, is_in_trait_impl));
 
         let (ident, (generics, kind)) = match &i.kind {
             AssocItemKind::Const(box ConstItem {

compiler/rustc_attr_parsing/src/context.rs

@@ -852,9 +852,9 @@ 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::must_use] && target == (Target::Trait) {
-                                panic!();
-                            }
+                            // if parts == &[sym::must_use] && target == (Target::Trait) {
+                            //     panic!();
+                            // }
 
                             self.dcx().span_bug(n.item.span(), format!("{:?} target {target:?} not allowed {:?}", parts, accept.allowed_targets));
                         }

compiler/rustc_hir/src/target.rs

@@ -6,7 +6,7 @@
 
 use std::fmt::{self, Display};
 
-use rustc_ast::{ForeignItemKind, ast};
+use rustc_ast::{ForeignItemKind, ast, AssocItemKind};
 
 use crate::def::DefKind;
 use crate::{Item, ItemKind, TraitItem, TraitItemKind, hir};
@@ -224,6 +224,19 @@ impl Target {
         }
     }
 
+    pub fn from_assoc_item_kind(kind: &ast::AssocItemKind, is_in_trait_impl: bool) -> Target {
+        match 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!(),
+        }
+    }
+
     pub fn name(self) -> &'static str {
         match self {
             Target::ExternCrate => "extern crate",