rustc: collapse relevant DefPathData variants into TypeNs.

[rust.git] / src / librustc / hir / map / definitions.rs

diff --git a/src/librustc/hir/map/definitions.rs b/src/librustc/hir/map/definitions.rs
index 1006d813e65ed6cd29183fa0fff77da36c9f00b6..99b3865c82a1a9a49351a953e847c799236b93da 100644 (file)
--- a/src/librustc/hir/map/definitions.rs
+++ b/src/librustc/hir/map/definitions.rs
@@ -337,33 +337,19 @@ pub enum DefPathData {
     // Different kinds of items and item-like things:
     /// An impl
     Impl,
-    /// A trait
-    Trait(InternedString),
-    /// An associated type **declaration** (i.e., in a trait)
-    AssocTypeInTrait(InternedString),
-    /// An associated type **value** (i.e., in an impl)
-    AssocTypeInImpl(InternedString),
-    /// An existential associated type **value** (i.e., in an impl)
-    AssocExistentialInImpl(InternedString),
     /// Something in the type NS
     TypeNs(InternedString),
     /// Something in the value NS
     ValueNs(InternedString),
-    /// A module declaration
-    Module(InternedString),
     /// A macro rule
     MacroDef(InternedString),
     /// A closure expression
     ClosureExpr,
     // Subportions of items
-    /// A type (generic) parameter
-    TypeParam(InternedString),
     /// A lifetime (generic) parameter
     LifetimeParam(InternedString),
     /// A const (generic) parameter
     ConstParam(InternedString),
-    /// A variant of a enum
-    EnumVariant(InternedString),
     /// A struct field
     Field(InternedString),
     /// Implicit ctor for a unit or tuple-like struct or enum variant.
@@ -376,8 +362,6 @@ pub enum DefPathData {
     /// a whole crate (as opposed to just one item). GlobalMetaData components
     /// are only supposed to show up right below the crate root.
     GlobalMetaData(InternedString),
-    /// A trait alias.
-    TraitAlias(InternedString),
 }
 
 #[derive(Copy, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Debug,
@@ -633,18 +617,10 @@ pub fn get_opt_name(&self) -> Option<InternedString> {
         use self::DefPathData::*;
         match *self {
             TypeNs(name) |
-            Trait(name) |
-            TraitAlias(name) |
-            AssocTypeInTrait(name) |
-            AssocTypeInImpl(name) |
-            AssocExistentialInImpl(name) |
             ValueNs(name) |
-            Module(name) |
             MacroDef(name) |
-            TypeParam(name) |
             LifetimeParam(name) |
             ConstParam(name) |
-            EnumVariant(name) |
             Field(name) |
             GlobalMetaData(name) => Some(name),
 
@@ -662,18 +638,10 @@ pub fn as_interned_str(&self) -> InternedString {
         use self::DefPathData::*;
         let s = match *self {
             TypeNs(name) |
-            Trait(name) |
-            TraitAlias(name) |
-            AssocTypeInTrait(name) |
-            AssocTypeInImpl(name) |
-            AssocExistentialInImpl(name) |
             ValueNs(name) |
-            Module(name) |
             MacroDef(name) |
-            TypeParam(name) |
             LifetimeParam(name) |
             ConstParam(name) |
-            EnumVariant(name) |
             Field(name) |
             GlobalMetaData(name) => {
                 return name