replace hir().def_kind for def_kind query in rustc_passes

Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>

diff --git a/compiler/rustc_passes/src/check_const.rs b/compiler/rustc_passes/src/check_const.rs
index 7567fb075cceddc8fc8e6118f9d933d3d8a3bd42..0e4df831f3fe71f4e8d4d16f0f75ce23957db87d 100644 (file)
--- a/compiler/rustc_passes/src/check_const.rs
+++ b/compiler/rustc_passes/src/check_const.rs
@@ -88,7 +88,7 @@ pub(crate) fn provide(providers: &mut Providers) {
 
 fn check_item<'tcx>(tcx: TyCtxt<'tcx>, id: hir::ItemId) {
     let _: Option<_> = try {
-        if !matches!(tcx.hir().def_kind(id.def_id), DefKind::Impl) {
+        if !matches!(tcx.def_kind(id.def_id), DefKind::Impl) {
             None?
         }
 

diff --git a/compiler/rustc_passes/src/dead.rs b/compiler/rustc_passes/src/dead.rs
index e136bb000919e18a2f7190088191a5aea7bedc2a..55a67070a967455fd3586f4bba03cd4f816c0a5a 100644 (file)
--- a/compiler/rustc_passes/src/dead.rs
+++ b/compiler/rustc_passes/src/dead.rs
@@ -491,7 +491,7 @@ fn check_item<'tcx>(
         worklist.push(id.def_id);
     }
 
-    match tcx.hir().def_kind(id.def_id) {
+    match tcx.def_kind(id.def_id) {
         DefKind::Enum => {
             let item = tcx.hir().item(id);
             if let hir::ItemKind::Enum(ref enum_def, _) = item.kind {
@@ -544,7 +544,7 @@ fn check_item<'tcx>(
 
 fn check_trait_item<'tcx>(tcx: TyCtxt<'tcx>, worklist: &mut Vec<LocalDefId>, id: hir::TraitItemId) {
     use hir::TraitItemKind::{Const, Fn};
-    if matches!(tcx.hir().def_kind(id.def_id), DefKind::AssocConst | DefKind::AssocFn) {
+    if matches!(tcx.def_kind(id.def_id), DefKind::AssocConst | DefKind::AssocFn) {
         let trait_item = tcx.hir().trait_item(id);
         if matches!(trait_item.kind, Const(_, Some(_)) | Fn(_, hir::TraitFn::Provided(_)))
             && has_allow_dead_code_or_lang_attr(tcx, trait_item.hir_id())
@@ -559,7 +559,7 @@ fn check_foreign_item<'tcx>(
     worklist: &mut Vec<LocalDefId>,
     id: hir::ForeignItemId,
 ) {
-    if matches!(tcx.hir().def_kind(id.def_id), DefKind::Static(_) | DefKind::Fn)
+    if matches!(tcx.def_kind(id.def_id), DefKind::Static(_) | DefKind::Fn)
         && has_allow_dead_code_or_lang_attr(tcx, id.hir_id())
     {
         worklist.push(id.def_id);

diff --git a/compiler/rustc_passes/src/entry.rs b/compiler/rustc_passes/src/entry.rs
index b494a0fe2edf9ad7eb60c09e4f9d05880f4e6975..266e1315ce26df95c0095cacf78f7b79cc569e9b 100644 (file)
--- a/compiler/rustc_passes/src/entry.rs
+++ b/compiler/rustc_passes/src/entry.rs
@@ -82,7 +82,7 @@ fn find_item(id: ItemId, ctxt: &mut EntryContext<'_>) {
 
     match entry_point_type(ctxt, id, at_root) {
         EntryPointType::None => (),
-        _ if !matches!(ctxt.tcx.hir().def_kind(id.def_id), DefKind::Fn) => {
+        _ if !matches!(ctxt.tcx.def_kind(id.def_id), DefKind::Fn) => {
             let attrs = ctxt.tcx.hir().attrs(id.hir_id());
             if let Some(attr) = ctxt.tcx.sess.find_by_name(attrs, sym::start) {
                 throw_attr_err(&ctxt.tcx.sess, attr.span, "start");