Rename DefPathData::LifetimeDef to LifetimeParam

diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 830481d4f73610a98b09a52b4c9cb5cae48d2868..4f86f6348d8689bc7d2a27f84a02f78d81ecc66b 100644 (file)
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -699,7 +699,7 @@ fn collect_in_band_defs<T, F>(
                 self.resolver.definitions().create_def_with_parent(
                     parent_id.index,
                     def_node_id,
-                    DefPathData::LifetimeDef(str_name.as_interned_str()),
+                    DefPathData::LifetimeParam(str_name.as_interned_str()),
                     DefIndexAddressSpace::High,
                     Mark::root(),
                     span,
@@ -1424,7 +1424,7 @@ fn visit_lifetime(&mut self, lifetime: &'v hir::Lifetime) {
                     self.context.resolver.definitions().create_def_with_parent(
                         self.parent,
                         def_node_id,
-                        DefPathData::LifetimeDef(name.name().as_interned_str()),
+                        DefPathData::LifetimeParam(name.name().as_interned_str()),
                         DefIndexAddressSpace::High,
                         Mark::root(),
                         lifetime.span,

diff --git a/src/librustc/hir/map/def_collector.rs b/src/librustc/hir/map/def_collector.rs
index 6015063aa821f8e873743d50ee26bceb301648c9..6555be110d1408047bb49211a61e669fb4d7ba7d 100644 (file)
--- a/src/librustc/hir/map/def_collector.rs
+++ b/src/librustc/hir/map/def_collector.rs
@@ -173,7 +173,7 @@ fn visit_variant_data(&mut self, data: &'a VariantData, _: Ident,
     fn visit_generic_param(&mut self, param: &'a GenericParamAST) {
         let name = param.ident.name.as_interned_str();
         let def_path_data = match param.kind {
-            GenericParamKindAST::Lifetime { .. } => DefPathData::LifetimeDef(name),
+            GenericParamKindAST::Lifetime { .. } => DefPathData::LifetimeParam(name),
             GenericParamKindAST::Type { .. } => DefPathData::TypeParam(name),
         };
         self.create_def(

diff --git a/src/librustc/hir/map/definitions.rs b/src/librustc/hir/map/definitions.rs
index 99023a168674179cf37721c05f9362cbea53307f..b1cb9d7fbd4a5aa201ebc1735c1fd109b29af5f8 100644 (file)
--- a/src/librustc/hir/map/definitions.rs
+++ b/src/librustc/hir/map/definitions.rs
@@ -360,7 +360,7 @@ pub enum DefPathData {
     /// A type parameter (generic parameter)
     TypeParam(InternedString),
     /// A lifetime definition
-    LifetimeDef(InternedString),
+    LifetimeParam(InternedString),
     /// A variant of a enum
     EnumVariant(InternedString),
     /// A struct field
@@ -625,7 +625,7 @@ pub fn get_opt_name(&self) -> Option<InternedString> {
             Module(name) |
             MacroDef(name) |
             TypeParam(name) |
-            LifetimeDef(name) |
+            LifetimeParam(name) |
             EnumVariant(name) |
             Field(name) |
             GlobalMetaData(name) => Some(name),
@@ -652,7 +652,7 @@ pub fn as_interned_str(&self) -> InternedString {
             Module(name) |
             MacroDef(name) |
             TypeParam(name) |
-            LifetimeDef(name) |
+            LifetimeParam(name) |
             EnumVariant(name) |
             Field(name) |
             GlobalMetaData(name) => {

diff --git a/src/librustc/ty/item_path.rs b/src/librustc/ty/item_path.rs
index d858ba7acf7863bf1da169566d194b99404db518..479fbe2673b97357a8d54aaa37dd41e06c6d0433 100644 (file)
--- a/src/librustc/ty/item_path.rs
+++ b/src/librustc/ty/item_path.rs
@@ -215,7 +215,7 @@ pub fn push_item_path<T>(self, buffer: &mut T, def_id: DefId)
             data @ DefPathData::ValueNs(..) |
             data @ DefPathData::Module(..) |
             data @ DefPathData::TypeParam(..) |
-            data @ DefPathData::LifetimeDef(..) |
+            data @ DefPathData::LifetimeParam(..) |
             data @ DefPathData::EnumVariant(..) |
             data @ DefPathData::Field(..) |
             data @ DefPathData::AnonConst |

diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs
index 883882dfe6837f22be689cc3c2aa5499fd7ee386..772de04d364da6c152ceb9d8d02f588a91d3a901 100644 (file)
--- a/src/librustc/util/ppaux.rs
+++ b/src/librustc/util/ppaux.rs
@@ -287,7 +287,7 @@ fn parameterized<F: fmt::Write>(&mut self,
                     DefPathData::MacroDef(_) |
                     DefPathData::ClosureExpr |
                     DefPathData::TypeParam(_) |
-                    DefPathData::LifetimeDef(_) |
+                    DefPathData::LifetimeParam(_) |
                     DefPathData::Field(_) |
                     DefPathData::StructCtor |
                     DefPathData::AnonConst |