user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename DefPathData::LifetimeDef to LifetimeParam

Browse source
This commit is contained in:
varkor 2018-05-26 23:56:34 +01:00
parent c65454850f
commit 10229fd9d5
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/hir/lowering.rs
View file

@ -699,7 +699,7 @@ impl<'a> LoweringContext<'a> {
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 @@ impl<'a> LoweringContext<'a> {
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,

2
src/librustc/hir/map/def_collector.rs
View file

@ -173,7 +173,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
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(

6
src/librustc/hir/map/definitions.rs
View file

@ -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 @@ impl DefPathData {
Module(name) |
MacroDef(name) |
TypeParam(name) |
LifetimeDef(name) |
LifetimeParam(name) |
EnumVariant(name) |
Field(name) |
GlobalMetaData(name) => Some(name),
@ -652,7 +652,7 @@ impl DefPathData {
Module(name) |
MacroDef(name) |
TypeParam(name) |
LifetimeDef(name) |
LifetimeParam(name) |
EnumVariant(name) |
Field(name) |
GlobalMetaData(name) => {

2
src/librustc/ty/item_path.rs
View file

@ -215,7 +215,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
data @ DefPathData::ValueNs(..) |
data @ DefPathData::Module(..) |
data @ DefPathData::TypeParam(..) |
data @ DefPathData::LifetimeDef(..) |
data @ DefPathData::LifetimeParam(..) |
data @ DefPathData::EnumVariant(..) |
data @ DefPathData::Field(..) |
data @ DefPathData::AnonConst |

2
src/librustc/util/ppaux.rs
View file

@ -287,7 +287,7 @@ impl PrintContext {
DefPathData::MacroDef(_) |
DefPathData::ClosureExpr |
DefPathData::TypeParam(_) |
DefPathData::LifetimeDef(_) |
DefPathData::LifetimeParam(_) |
DefPathData::Field(_) |
DefPathData::StructCtor |
DefPathData::AnonConst |