From 2efeb485a99dc3a769f21f111310a6541b21d8b2 Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <edy.burt@gmail.com>
Date: Fri, 3 May 2019 22:28:29 +0300
Subject: [PATCH] rustc: collapse relevant DefPathData variants into ValueNs.

---
 src/librustc/hir/map/def_collector.rs | 4 ++--
 src/librustc/hir/map/definitions.rs   | 8 --------
 src/librustc/ty/print/pretty.rs       | 2 --
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/librustc/hir/map/def_collector.rs b/src/librustc/hir/map/def_collector.rs
index e3e451a61f5..3b2bdfc8b89 100644
--- a/src/librustc/hir/map/def_collector.rs
+++ b/src/librustc/hir/map/def_collector.rs
@@ -226,7 +226,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
             let name = field.ident.map(|ident| ident.name)
                 .unwrap_or_else(|| Symbol::intern(&index.to_string()));
             let def = self.create_def(field.id,
-                                      DefPathData::Field(name.as_interned_str()),
+                                      DefPathData::ValueNs(name.as_interned_str()),
                                       REGULAR_SPACE,
                                       field.span);
             self.with_parent(def, |this| this.visit_struct_field(field));
@@ -238,7 +238,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
         let def_path_data = match param.kind {
             GenericParamKind::Lifetime { .. } => DefPathData::LifetimeParam(name),
             GenericParamKind::Type { .. } => DefPathData::TypeNs(name),
-            GenericParamKind::Const { .. } => DefPathData::ConstParam(name),
+            GenericParamKind::Const { .. } => DefPathData::ValueNs(name),
         };
         self.create_def(param.id, def_path_data, REGULAR_SPACE, param.ident.span);
 
diff --git a/src/librustc/hir/map/definitions.rs b/src/librustc/hir/map/definitions.rs
index 99b3865c82a..ddc76140167 100644
--- a/src/librustc/hir/map/definitions.rs
+++ b/src/librustc/hir/map/definitions.rs
@@ -348,10 +348,6 @@ pub enum DefPathData {
     // Subportions of items
     /// A lifetime (generic) parameter
     LifetimeParam(InternedString),
-    /// A const (generic) parameter
-    ConstParam(InternedString),
-    /// A struct field
-    Field(InternedString),
     /// Implicit ctor for a unit or tuple-like struct or enum variant.
     Ctor,
     /// A constant expression (see {ast,hir}::AnonConst).
@@ -620,8 +616,6 @@ impl DefPathData {
             ValueNs(name) |
             MacroDef(name) |
             LifetimeParam(name) |
-            ConstParam(name) |
-            Field(name) |
             GlobalMetaData(name) => Some(name),
 
             Impl |
@@ -641,8 +635,6 @@ impl DefPathData {
             ValueNs(name) |
             MacroDef(name) |
             LifetimeParam(name) |
-            ConstParam(name) |
-            Field(name) |
             GlobalMetaData(name) => {
                 return name
             }
diff --git a/src/librustc/ty/print/pretty.rs b/src/librustc/ty/print/pretty.rs
index c66610c98d5..5836e510cad 100644
--- a/src/librustc/ty/print/pretty.rs
+++ b/src/librustc/ty/print/pretty.rs
@@ -859,9 +859,7 @@ impl TyCtxt<'_, '_, '_> {
     fn guess_def_namespace(self, def_id: DefId) -> Namespace {
         match self.def_key(def_id).disambiguated_data.data {
             DefPathData::ValueNs(..) |
-            DefPathData::Field(..) |
             DefPathData::AnonConst |
-            DefPathData::ConstParam(..) |
             DefPathData::ClosureExpr |
             DefPathData::Ctor => Namespace::ValueNS,