From 460ca4f037e4896f103889b694dd2971e3141eac Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Wed, 5 Mar 2014 06:59:35 +0100 Subject: [PATCH] Alpha-rename `.ident` fields of type `Name` to `.name`. --- src/librustc/metadata/decoder.rs | 2 +- src/librustc/metadata/encoder.rs | 2 +- src/librustc/metadata/tyencode.rs | 8 ++++---- src/librustc/middle/ty.rs | 4 ++-- src/librustc/middle/typeck/check/mod.rs | 2 +- src/librustc/middle/typeck/collect.rs | 6 +++--- src/librustc/middle/typeck/rscope.rs | 2 +- src/librustc/util/ppaux.rs | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs index caf4670b40a9..678e81b7fea7 100644 --- a/src/librustc/metadata/decoder.rs +++ b/src/librustc/metadata/decoder.rs @@ -273,7 +273,7 @@ fn item_region_param_defs(item_doc: ebml::Doc, cdata: Cmd) tag_region_param_def_def_id); let def_id = reader::with_doc_data(def_id_doc, parse_def_id); let def_id = translate_def_id(cdata, def_id); - v.push(ty::RegionParameterDef { ident: ident.name, + v.push(ty::RegionParameterDef { name: ident.name, def_id: def_id }); true }); diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index 91c0d093653f..b6eab7b8a747 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -184,7 +184,7 @@ fn encode_region_param_defs(ebml_w: &mut writer::Encoder, ebml_w.start_tag(tag_region_param_def); ebml_w.start_tag(tag_region_param_def_ident); - encode_name(ebml_w, param.ident); + encode_name(ebml_w, param.name); ebml_w.end_tag(); ebml_w.wr_tagged_str(tag_region_param_def_def_id, diff --git a/src/librustc/metadata/tyencode.rs b/src/librustc/metadata/tyencode.rs index be3180596e02..590487f20d09 100644 --- a/src/librustc/metadata/tyencode.rs +++ b/src/librustc/metadata/tyencode.rs @@ -176,11 +176,11 @@ fn enc_region(w: &mut MemWriter, cx: @ctxt, r: ty::Region) { enc_bound_region(w, cx, br); mywrite!(w, "]"); } - ty::ReEarlyBound(node_id, index, ident) => { + ty::ReEarlyBound(node_id, index, name) => { mywrite!(w, "B[{}|{}|{}]", node_id, index, - token::get_name(ident)); + token::get_name(name)); } ty::ReFree(ref fr) => { mywrite!(w, "f[{}|", fr.scope_id); @@ -208,10 +208,10 @@ fn enc_bound_region(w: &mut MemWriter, cx: @ctxt, br: ty::BoundRegion) { ty::BrAnon(idx) => { mywrite!(w, "a{}|", idx); } - ty::BrNamed(d, s) => { + ty::BrNamed(d, name) => { mywrite!(w, "[{}|{}]", (cx.ds)(d), - token::get_name(s)); + token::get_name(name)); } ty::BrFresh(id) => { mywrite!(w, "f{}|", id); diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 4d0f6704379d..5129d7a8b684 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -996,7 +996,7 @@ pub struct TypeParameterDef { #[deriving(Encodable, Decodable, Clone)] pub struct RegionParameterDef { - ident: ast::Name, + name: ast::Name, def_id: ast::DefId, } @@ -5107,7 +5107,7 @@ pub fn construct_parameter_environment( let region_params = item_region_params.iter(). map(|r| ty::ReFree(ty::FreeRegion { scope_id: free_id, - bound_region: ty::BrNamed(r.def_id, r.ident)})). + bound_region: ty::BrNamed(r.def_id, r.name)})). collect(); let free_substs = substs { diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index 3c98f3defd6e..e0b6fc4597ce 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -901,7 +901,7 @@ fn compare_impl_method(tcx: ty::ctxt, impl_generics.region_param_defs().iter(). map(|l| ty::ReFree(ty::FreeRegion { scope_id: impl_m_body_id, - bound_region: ty::BrNamed(l.def_id, l.ident)})). + bound_region: ty::BrNamed(l.def_id, l.name)})). collect(); let dummy_substs = ty::substs { tps: vec_ng::append(dummy_impl_tps, dummy_method_tps.as_slice()), diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs index 18fbb47aad1b..04f37c95b07b 100644 --- a/src/librustc/middle/typeck/collect.rs +++ b/src/librustc/middle/typeck/collect.rs @@ -315,7 +315,7 @@ pub fn ensure_trait_methods(ccx: &CrateCtxt, trait_id: ast::NodeId) { let rps_from_trait = trait_ty_generics.region_param_defs().iter(). enumerate(). - map(|(index,d)| ty::ReEarlyBound(d.def_id.node, index, d.ident)). + map(|(index,d)| ty::ReEarlyBound(d.def_id.node, index, d.name)). collect(); // build up the substitution from @@ -966,7 +966,7 @@ pub fn ty_generics(ccx: &CrateCtxt, base_index: uint) -> ty::Generics { return ty::Generics { region_param_defs: Rc::new(generics.lifetimes.iter().map(|l| { - ty::RegionParameterDef { ident: l.ident, + ty::RegionParameterDef { name: l.ident, def_id: local_def(l.id) } }).collect()), type_param_defs: Rc::new(generics.ty_params.mapi_to_vec(|offset, param| { @@ -1095,7 +1095,7 @@ pub fn mk_item_substs(ccx: &CrateCtxt, let regions: OptVec = ty_generics.region_param_defs().iter().enumerate().map( - |(i, l)| ty::ReEarlyBound(l.def_id.node, i, l.ident)).collect(); + |(i, l)| ty::ReEarlyBound(l.def_id.node, i, l.name)).collect(); substs {regions: ty::NonerasedRegions(regions), self_ty: self_ty, diff --git a/src/librustc/middle/typeck/rscope.rs b/src/librustc/middle/typeck/rscope.rs index eb633eb2eee0..078415bc6441 100644 --- a/src/librustc/middle/typeck/rscope.rs +++ b/src/librustc/middle/typeck/rscope.rs @@ -78,5 +78,5 @@ pub fn bound_type_regions(defs: &[ty::RegionParameterDef]) -> OptVec { assert!(defs.iter().all(|def| def.def_id.krate == ast::LOCAL_CRATE)); defs.iter().enumerate().map( - |(i, def)| ty::ReEarlyBound(def.def_id.node, i, def.ident)).collect() + |(i, def)| ty::ReEarlyBound(def.def_id.node, i, def.name)).collect() } diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index ecba394b88e2..83877e1710ad 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -634,7 +634,7 @@ impl Repr for ty::TypeParameterDef { impl Repr for ty::RegionParameterDef { fn repr(&self, _tcx: ctxt) -> ~str { format!("RegionParameterDef({}, {:?})", - token::get_name(self.ident), + token::get_name(self.name), self.def_id) } }