Skip to content

Commit 189c008

Browse files
pnkfelixpnkfelix
committed
alpha-rename .ident to .name in Lifetime, including in rustdoc.
1 parent 460ca4f commit 189c008

File tree

11 files changed

+29
-29
lines changed

11 files changed

+29
-29
lines changed

‎src/librustc/middle/resolve_lifetime.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ impl<'a> Visitor<&'a ScopeChain<'a>> for LifetimeContext {
145145
fn visit_lifetime_ref(&mut self,
146146
lifetime_ref: &ast::Lifetime,
147147
scope: &'a ScopeChain<'a>) {
148-
if lifetime_ref.ident == special_idents::statik.name {
148+
if lifetime_ref.name == special_idents::statik.name {
149149
self.insert_lifetime(lifetime_ref, ast::DefStaticRegion);
150150
return;
151151
}
@@ -262,7 +262,7 @@ impl LifetimeContext {
262262
self.sess.span_err(
263263
lifetime_ref.span,
264264
format!("use of undeclared lifetime name `'{}`",
265-
token::get_name(lifetime_ref.ident)));
265+
token::get_name(lifetime_ref.name)));
266266
}
267267

268268
fn check_lifetime_names(&self, lifetimes: &OptVec<ast::Lifetime>) {
@@ -271,23 +271,23 @@ impl LifetimeContext {
271271

272272
let special_idents = [special_idents::statik];
273273
for lifetime in lifetimes.iter() {
274-
if special_idents.iter().any(|&i| i.name == lifetime.ident) {
274+
if special_idents.iter().any(|&i| i.name == lifetime.name) {
275275
self.sess.span_err(
276276
lifetime.span,
277277
format!("illegal lifetime parameter name: `{}`",
278-
token::get_name(lifetime.ident)));
278+
token::get_name(lifetime.name)));
279279
}
280280
}
281281

282282
for j in range(i + 1, lifetimes.len()) {
283283
let lifetime_j = lifetimes.get(j);
284284

285-
if lifetime_i.ident == lifetime_j.ident {
285+
if lifetime_i.name == lifetime_j.name {
286286
self.sess.span_err(
287287
lifetime_j.span,
288288
format!("lifetime name `'{}` declared twice in \
289289
the same scope",
290-
token::get_name(lifetime_j.ident)));
290+
token::get_name(lifetime_j.name)));
291291
}
292292
}
293293
}
@@ -315,7 +315,7 @@ fn search_lifetimes(lifetimes: &OptVec<ast::Lifetime>,
315315
lifetime_ref: &ast::Lifetime)
316316
-> Option<(uint, ast::NodeId)> {
317317
for (i, lifetime_decl) in lifetimes.iter().enumerate() {
318-
if lifetime_decl.ident == lifetime_ref.ident {
318+
if lifetime_decl.name == lifetime_ref.name {
319319
return Some((i, lifetime_decl.id));
320320
}
321321
}

‎src/librustc/middle/typeck/astconv.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,18 @@ pub fn ast_region_to_region(tcx: ty::ctxt, lifetime: &ast::Lifetime)
9292

9393
Some(&ast::DefLateBoundRegion(binder_id, _, id)) => {
9494
ty::ReLateBound(binder_id, ty::BrNamed(ast_util::local_def(id),
95-
lifetime.ident))
95+
lifetime.name))
9696
}
9797

9898
Some(&ast::DefEarlyBoundRegion(index, id)) => {
99-
ty::ReEarlyBound(id, index, lifetime.ident)
99+
ty::ReEarlyBound(id, index, lifetime.name)
100100
}
101101

102102
Some(&ast::DefFreeRegion(scope_id, id)) => {
103103
ty::ReFree(ty::FreeRegion {
104104
scope_id: scope_id,
105105
bound_region: ty::BrNamed(ast_util::local_def(id),
106-
lifetime.ident)
106+
lifetime.name)
107107
})
108108
}
109109
};

‎src/librustc/middle/typeck/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ pub fn ty_generics(ccx: &CrateCtxt,
966966
base_index: uint) -> ty::Generics {
967967
return ty::Generics {
968968
region_param_defs: Rc::new(generics.lifetimes.iter().map(|l| {
969-
ty::RegionParameterDef { name: l.ident,
969+
ty::RegionParameterDef { name: l.name,
970970
def_id: local_def(l.id) }
971971
}).collect()),
972972
type_param_defs: Rc::new(generics.ty_params.mapi_to_vec(|offset, param| {

‎src/librustc/util/ppaux.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ pub fn bound_region_to_str(cx: ctxt,
161161
}
162162

163163
match br {
164-
BrNamed(_, ident) => format!("{}'{}{}", prefix,
165-
token::get_name(ident), space_str),
164+
BrNamed(_, name) => format!("{}'{}{}", prefix,
165+
token::get_name(name), space_str),
166166
BrAnon(_) => prefix.to_str(),
167167
BrFresh(_) => prefix.to_str(),
168168
}
@@ -224,7 +224,7 @@ pub fn region_to_str(cx: ctxt, prefix: &str, space: bool, region: Region) -> ~st
224224
// `explain_region()` or `note_and_explain_region()`.
225225
match region {
226226
ty::ReScope(_) => prefix.to_str(),
227-
ty::ReEarlyBound(_, _, ident) => token::get_name(ident).get().to_str(),
227+
ty::ReEarlyBound(_, _, name) => token::get_name(name).get().to_str(),
228228
ty::ReLateBound(_, br) => bound_region_to_str(cx, prefix, space, br),
229229
ty::ReFree(ref fr) => bound_region_to_str(cx, prefix, space, fr.bound_region),
230230
ty::ReInfer(ReSkolemized(_, br)) => {
@@ -720,9 +720,9 @@ impl Repr for ty::BoundRegion {
720720
fn repr(&self, tcx: ctxt) -> ~str {
721721
match *self {
722722
ty::BrAnon(id) => format!("BrAnon({})", id),
723-
ty::BrNamed(id, ident) => format!("BrNamed({}, {})",
724-
id.repr(tcx),
725-
token::get_name(ident)),
723+
ty::BrNamed(id, name) => format!("BrNamed({}, {})",
724+
id.repr(tcx),
725+
token::get_name(name)),
726726
ty::BrFresh(id) => format!("BrFresh({})", id),
727727
}
728728
}
@@ -731,9 +731,9 @@ impl Repr for ty::BoundRegion {
731731
impl Repr for ty::Region {
732732
fn repr(&self, tcx: ctxt) -> ~str {
733733
match *self {
734-
ty::ReEarlyBound(id, index, ident) => {
734+
ty::ReEarlyBound(id, index, name) => {
735735
format!("ReEarlyBound({}, {}, {})",
736-
id, index, token::get_name(ident))
736+
id, index, token::get_name(name))
737737
}
738738

739739
ty::ReLateBound(binder_id, ref bound_region) => {

‎src/librustdoc/clean.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ impl Lifetime {
333333

334334
impl Clean<Lifetime> for ast::Lifetime {
335335
fn clean(&self) -> Lifetime {
336-
Lifetime(token::get_name(self.ident).get().to_owned())
336+
Lifetime(token::get_name(self.name).get().to_owned())
337337
}
338338
}
339339

‎src/libsyntax/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ pub type FnIdent = Option<Ident>;
118118
pub struct Lifetime {
119119
id: NodeId,
120120
span: Span,
121-
ident: Name
121+
name: Name
122122
}
123123

124124
// a "Path" is essentially Rust's notion of a name;

‎src/libsyntax/ext/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,8 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
413413
ast::TraitTyParamBound(self.trait_ref(path))
414414
}
415415

416-
fn lifetime(&self, span: Span, ident: ast::Name) -> ast::Lifetime {
417-
ast::Lifetime { id: ast::DUMMY_NODE_ID, span: span, ident: ident }
416+
fn lifetime(&self, span: Span, name: ast::Name) -> ast::Lifetime {
417+
ast::Lifetime { id: ast::DUMMY_NODE_ID, span: span, name: name }
418418
}
419419

420420
fn stmt_expr(&self, expr: @ast::Expr) -> @ast::Stmt {

‎src/libsyntax/fold.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ pub fn fold_lifetime<T: Folder>(l: &Lifetime, fld: &mut T) -> Lifetime {
435435
Lifetime {
436436
id: fld.new_id(l.id),
437437
span: fld.new_span(l.span),
438-
ident: l.ident
438+
name: l.name
439439
}
440440
}
441441

‎src/libsyntax/parse/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ mod test {
323323
segments: vec!(
324324
ast::PathSegment {
325325
identifier: str_to_ident("a"),
326-
lifetimes: opt_vec::Empty,
326+
lifetimes: Vec::new(),
327327
types: opt_vec::Empty,
328328
}
329329
),
@@ -342,12 +342,12 @@ mod test {
342342
segments: vec!(
343343
ast::PathSegment {
344344
identifier: str_to_ident("a"),
345-
lifetimes: opt_vec::Empty,
345+
lifetimes: Vec::new(),
346346
types: opt_vec::Empty,
347347
},
348348
ast::PathSegment {
349349
identifier: str_to_ident("b"),
350-
lifetimes: opt_vec::Empty,
350+
lifetimes: Vec::new(),
351351
types: opt_vec::Empty,
352352
}
353353
)

‎src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1609,7 +1609,7 @@ impl Parser {
16091609
return ast::Lifetime {
16101610
id: ast::DUMMY_NODE_ID,
16111611
span: span,
1612-
ident: i.name
1612+
name: i.name
16131613
};
16141614
}
16151615
_ => {

‎src/libsyntax/print/pprust.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1956,7 +1956,7 @@ pub fn print_bounds(s: &mut State, bounds: &OptVec<ast::TyParamBound>,
19561956
pub fn print_lifetime(s: &mut State,
19571957
lifetime: &ast::Lifetime) -> io::IoResult<()> {
19581958
try!(word(&mut s.s, "'"));
1959-
print_name(s, lifetime.ident)
1959+
print_name(s, lifetime.name)
19601960
}
19611961

19621962
pub fn print_generics(s: &mut State,

0 commit comments

Comments
 (0)