dont use has_attr as it doesnt work with new style attrs

Author: BoxyUwU

compiler/rustc_const_eval/src/check_consts/qualifs.rs

@@ -8,6 +8,8 @@
 use rustc_errors::ErrorGuaranteed;
 use rustc_hir::LangItem;
 use rustc_hir::def::DefKind;
+use rustc_hir::attrs::AttributeKind;
+use rustc_hir::find_attr;
 use rustc_infer::infer::TyCtxtInferExt;
 use rustc_middle::mir::*;
 use rustc_middle::ty::{self, AdtDef, Ty};
@@ -369,7 +371,7 @@ where
         assert!(promoted.is_none() || Q::ALLOW_PROMOTED);
 
         let is_type_const_item = matches!(cx.tcx.def_kind(def), DefKind::Const | DefKind::AssocConst)
-        && cx.tcx.has_attr(def, sym::type_const);
+            && find_attr!(cx.tcx.get_all_attrs(def), AttributeKind::TypeConst(_));
 
         // Don't peak inside trait associated consatnts, also `#[type_const] const` items
         // don't have bodies so there's nothing to look at

compiler/rustc_hir_analysis/src/lib.rs

@@ -93,6 +93,8 @@ pub use errors::NoVariantNamed;
 use rustc_abi::{CVariadicStatus, ExternAbi};
 use rustc_hir::def::DefKind;
 use rustc_hir::lints::DelayedLint;
+use rustc_hir::attrs::AttributeKind;
+use rustc_hir::find_attr;
 use rustc_hir::{self as hir};
 use rustc_middle::mir::interpret::GlobalId;
 use rustc_middle::query::Providers;
@@ -229,7 +231,7 @@ pub fn check_crate(tcx: TyCtxt<'_>) {
             }
             DefKind::Const
                 if !tcx.generics_of(item_def_id).own_requires_monomorphization()
-                    && !tcx.has_attr(item_def_id, sym::type_const) =>
+                    && !find_attr!(tcx.get_all_attrs(item_def_id), AttributeKind::TypeConst(_)) =>
             {
                 // FIXME(generic_const_items): Passing empty instead of identity args is fishy but
                 //                             seems to be fine for now. Revisit this!

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -1605,12 +1605,12 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
                 record!(self.tables.anon_const_kind[def_id] <- self.tcx.anon_const_kind(def_id));
             }
             if let DefKind::Const = def_kind
-                && tcx.has_attr(def_id, sym::type_const)
+                && find_attr!(tcx.get_all_attrs(def_id), AttributeKind::TypeConst(_))
             {
                 record!(self.tables.const_of_item[def_id] <- self.tcx.const_of_item(def_id));
             }
             if let DefKind::AssocConst = def_kind
-                && tcx.has_attr(def_id, sym::type_const)
+                && find_attr!(tcx.get_all_attrs(def_id), AttributeKind::TypeConst(_))
             {
                 let assoc_item = tcx.associated_item(def_id);
                 let should_encode = match assoc_item.container {