Remove SimpleDefKind

3 files changed, 4 insertions, 26 deletions

diff --git a/compiler/rustc_query_impl/src/lib.rs b/compiler/rustc_query_impl/src/lib.rs
index 55e95e1a592..832540a85e7 100644
--- a/compiler/rustc_query_impl/src/lib.rs
+++ b/compiler/rustc_query_impl/src/lib.rs
@@ -44,8 +44,6 @@ pub use on_disk_cache::OnDiskCache;
 mod profiling_support;
 pub use self::profiling_support::alloc_self_profile_query_strings;
 
-mod util;
-
 fn describe_as_module(def_id: LocalDefId, tcx: TyCtxt<'_>) -> String {
     if def_id.is_top_level_module() {
         "top-level module".to_string()
diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs
index ff9d32a6776..f9668a76723 100644
--- a/compiler/rustc_query_impl/src/plumbing.rs
+++ b/compiler/rustc_query_impl/src/plumbing.rs
@@ -289,13 +289,11 @@ macro_rules! define_queries {
                 } else {
                     Some(key.default_span(*tcx))
                 };
-                let def_id = key.key_as_def_id();
-                let def_kind = def_id
+                // Use `tcx.hir().opt_def_kind()` to reduce the chance of
+                // accidentally triggering an infinite query loop.
+                let def_kind = key.key_as_def_id()
                     .and_then(|def_id| def_id.as_local())
-                    // Use `tcx.hir().opt_def_kind()` to reduce the chance of
-                    // accidentally triggering an infinite query loop.
-                    .and_then(|def_id| tcx.hir().opt_def_kind(def_id))
-                    .map(|def_kind| $crate::util::def_kind_to_simple_def_kind(def_kind));
+                    .and_then(|def_id| tcx.hir().opt_def_kind(def_id));
                 let hash = || {
                     let mut hcx = tcx.create_stable_hashing_context();
                     let mut hasher = StableHasher::new();
diff --git a/compiler/rustc_query_impl/src/util.rs b/compiler/rustc_query_impl/src/util.rs
deleted file mode 100644
index 517c107b5d9..00000000000
--- a/compiler/rustc_query_impl/src/util.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use rustc_hir::def::DefKind;
-use rustc_query_system::query::SimpleDefKind;
-
-/// Convert a [`DefKind`] to a [`SimpleDefKind`].
-///
-/// *See [`SimpleDefKind`]'s docs for more information.*
-pub(crate) fn def_kind_to_simple_def_kind(def_kind: DefKind) -> SimpleDefKind {
-    match def_kind {
-        DefKind::Struct => SimpleDefKind::Struct,
-        DefKind::Enum => SimpleDefKind::Enum,
-        DefKind::Union => SimpleDefKind::Union,
-        DefKind::Trait => SimpleDefKind::Trait,
-        DefKind::TyAlias => SimpleDefKind::TyAlias,
-        DefKind::TraitAlias => SimpleDefKind::TraitAlias,
-
-        _ => SimpleDefKind::Other,
-    }
-}