alpha-rename .ident to .name in Lifetime, including in rustdoc.

pnkfelix · pnkfelix · commit 189c0085d19c · 2014-03-12T08:02:32.000+01:00
diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs
@@ -145,7 +145,7 @@ impl<'a> Visitor<&'a ScopeChain<'a>> for LifetimeContext {
     fn visit_lifetime_ref(&mut self,
                           lifetime_ref: &ast::Lifetime,
                           scope: &'a ScopeChain<'a>) {
-        if lifetime_ref.ident == special_idents::statik.name {
+        if lifetime_ref.name == special_idents::statik.name {
             self.insert_lifetime(lifetime_ref, ast::DefStaticRegion);
             return;
         }
@@ -262,7 +262,7 @@ impl LifetimeContext {
         self.sess.span_err(
             lifetime_ref.span,
             format!("use of undeclared lifetime name `'{}`",
-                    token::get_name(lifetime_ref.ident)));
+                    token::get_name(lifetime_ref.name)));
     }
 
     fn check_lifetime_names(&self, lifetimes: &OptVec<ast::Lifetime>) {
@@ -271,23 +271,23 @@ impl LifetimeContext {
 
             let special_idents = [special_idents::statik];
             for lifetime in lifetimes.iter() {
-                if special_idents.iter().any(|&i| i.name == lifetime.ident) {
+                if special_idents.iter().any(|&i| i.name == lifetime.name) {
                     self.sess.span_err(
                         lifetime.span,
                         format!("illegal lifetime parameter name: `{}`",
-                                token::get_name(lifetime.ident)));
+                                token::get_name(lifetime.name)));
                 }
             }
 
             for j in range(i + 1, lifetimes.len()) {
                 let lifetime_j = lifetimes.get(j);
 
-                if lifetime_i.ident == lifetime_j.ident {
+                if lifetime_i.name == lifetime_j.name {
                     self.sess.span_err(
                         lifetime_j.span,
                         format!("lifetime name `'{}` declared twice in \
                                 the same scope",
-                                token::get_name(lifetime_j.ident)));
+                                token::get_name(lifetime_j.name)));
                 }
             }
         }
@@ -315,7 +315,7 @@ fn search_lifetimes(lifetimes: &OptVec<ast::Lifetime>,
                     lifetime_ref: &ast::Lifetime)
                     -> Option<(uint, ast::NodeId)> {
     for (i, lifetime_decl) in lifetimes.iter().enumerate() {
-        if lifetime_decl.ident == lifetime_ref.ident {
+        if lifetime_decl.name == lifetime_ref.name {
             return Some((i, lifetime_decl.id));
         }
     }
diff --git a/src/librustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs
@@ -92,18 +92,18 @@ pub fn ast_region_to_region(tcx: ty::ctxt, lifetime: &ast::Lifetime)
 
         Some(&ast::DefLateBoundRegion(binder_id, _, id)) => {
             ty::ReLateBound(binder_id, ty::BrNamed(ast_util::local_def(id),
-                                                   lifetime.ident))
+                                                   lifetime.name))
         }
 
         Some(&ast::DefEarlyBoundRegion(index, id)) => {
-            ty::ReEarlyBound(id, index, lifetime.ident)
+            ty::ReEarlyBound(id, index, lifetime.name)
         }
 
         Some(&ast::DefFreeRegion(scope_id, id)) => {
             ty::ReFree(ty::FreeRegion {
                     scope_id: scope_id,
                     bound_region: ty::BrNamed(ast_util::local_def(id),
-                                              lifetime.ident)
+                                              lifetime.name)
                 })
         }
     };
diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs
@@ -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 { name: l.ident,
+                ty::RegionParameterDef { name: l.name,
                                          def_id: local_def(l.id) }
             }).collect()),
         type_param_defs: Rc::new(generics.ty_params.mapi_to_vec(|offset, param| {
diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs
@@ -161,8 +161,8 @@ pub fn bound_region_to_str(cx: ctxt,
     }
 
     match br {
-        BrNamed(_, ident)   => format!("{}'{}{}", prefix,
-                                       token::get_name(ident), space_str),
+        BrNamed(_, name)   => format!("{}'{}{}", prefix,
+                                      token::get_name(name), space_str),
         BrAnon(_)           => prefix.to_str(),
         BrFresh(_)          => prefix.to_str(),
     }
@@ -224,7 +224,7 @@ pub fn region_to_str(cx: ctxt, prefix: &str, space: bool, region: Region) -> ~st
     // `explain_region()` or `note_and_explain_region()`.
     match region {
         ty::ReScope(_) => prefix.to_str(),
-        ty::ReEarlyBound(_, _, ident) => token::get_name(ident).get().to_str(),
+        ty::ReEarlyBound(_, _, name) => token::get_name(name).get().to_str(),
         ty::ReLateBound(_, br) => bound_region_to_str(cx, prefix, space, br),
         ty::ReFree(ref fr) => bound_region_to_str(cx, prefix, space, fr.bound_region),
         ty::ReInfer(ReSkolemized(_, br)) => {
@@ -720,9 +720,9 @@ impl Repr for ty::BoundRegion {
     fn repr(&self, tcx: ctxt) -> ~str {
         match *self {
             ty::BrAnon(id) => format!("BrAnon({})", id),
-            ty::BrNamed(id, ident) => format!("BrNamed({}, {})",
-                                               id.repr(tcx),
-                                               token::get_name(ident)),
+            ty::BrNamed(id, name) => format!("BrNamed({}, {})",
+                                             id.repr(tcx),
+                                             token::get_name(name)),
             ty::BrFresh(id) => format!("BrFresh({})", id),
         }
     }
@@ -731,9 +731,9 @@ impl Repr for ty::BoundRegion {
 impl Repr for ty::Region {
     fn repr(&self, tcx: ctxt) -> ~str {
         match *self {
-            ty::ReEarlyBound(id, index, ident) => {
+            ty::ReEarlyBound(id, index, name) => {
                 format!("ReEarlyBound({}, {}, {})",
-                        id, index, token::get_name(ident))
+                        id, index, token::get_name(name))
             }
 
             ty::ReLateBound(binder_id, ref bound_region) => {
diff --git a/src/librustdoc/clean.rs b/src/librustdoc/clean.rs
@@ -333,7 +333,7 @@ impl Lifetime {
 
 impl Clean<Lifetime> for ast::Lifetime {
     fn clean(&self) -> Lifetime {
-        Lifetime(token::get_name(self.ident).get().to_owned())
+        Lifetime(token::get_name(self.name).get().to_owned())
     }
 }
 
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
@@ -118,7 +118,7 @@ pub type FnIdent = Option<Ident>;
 pub struct Lifetime {
     id: NodeId,
     span: Span,
-    ident: Name
+    name: Name
 }
 
 // a "Path" is essentially Rust's notion of a name;
diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs
@@ -413,8 +413,8 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
         ast::TraitTyParamBound(self.trait_ref(path))
     }
 
-    fn lifetime(&self, span: Span, ident: ast::Name) -> ast::Lifetime {
-        ast::Lifetime { id: ast::DUMMY_NODE_ID, span: span, ident: ident }
+    fn lifetime(&self, span: Span, name: ast::Name) -> ast::Lifetime {
+        ast::Lifetime { id: ast::DUMMY_NODE_ID, span: span, name: name }
     }
 
     fn stmt_expr(&self, expr: @ast::Expr) -> @ast::Stmt {
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
@@ -435,7 +435,7 @@ pub fn fold_lifetime<T: Folder>(l: &Lifetime, fld: &mut T) -> Lifetime {
     Lifetime {
         id: fld.new_id(l.id),
         span: fld.new_span(l.span),
-        ident: l.ident
+        name: l.name
     }
 }
 
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
@@ -323,7 +323,7 @@ mod test {
                         segments: vec!(
                             ast::PathSegment {
                                 identifier: str_to_ident("a"),
-                                lifetimes: opt_vec::Empty,
+                                lifetimes: Vec::new(),
                                 types: opt_vec::Empty,
                             }
                         ),
@@ -342,12 +342,12 @@ mod test {
                             segments: vec!(
                                 ast::PathSegment {
                                     identifier: str_to_ident("a"),
-                                    lifetimes: opt_vec::Empty,
+                                    lifetimes: Vec::new(),
                                     types: opt_vec::Empty,
                                 },
                                 ast::PathSegment {
                                     identifier: str_to_ident("b"),
-                                    lifetimes: opt_vec::Empty,
+                                    lifetimes: Vec::new(),
                                     types: opt_vec::Empty,
                                 }
                             )
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -1609,7 +1609,7 @@ impl Parser {
                 return ast::Lifetime {
                     id: ast::DUMMY_NODE_ID,
                     span: span,
-                    ident: i.name
+                    name: i.name
                 };
             }
             _ => {
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
@@ -1956,7 +1956,7 @@ pub fn print_bounds(s: &mut State, bounds: &OptVec<ast::TyParamBound>,
 pub fn print_lifetime(s: &mut State,
                       lifetime: &ast::Lifetime) -> io::IoResult<()> {
     try!(word(&mut s.s, "'"));
-    print_name(s, lifetime.ident)
+    print_name(s, lifetime.name)
 }
 
 pub fn print_generics(s: &mut State,

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ impl<'a> Visitor<&'a ScopeChain<'a>> for LifetimeContext {`
`145`	`145`	`fn visit_lifetime_ref(&mut self,`
`146`	`146`	`lifetime_ref: &ast::Lifetime,`
`147`	`147`	`scope: &'a ScopeChain<'a>) {`
`148`		`- if lifetime_ref.ident == special_idents::statik.name {`
	`148`	`+ if lifetime_ref.name == special_idents::statik.name {`
`149`	`149`	`self.insert_lifetime(lifetime_ref, ast::DefStaticRegion);`
`150`	`150`	`return;`
`151`	`151`	`}`
`@@ -262,7 +262,7 @@ impl LifetimeContext {`
`262`	`262`	`self.sess.span_err(`
`263`	`263`	`lifetime_ref.span,`
`264`	`264`	format!("use of undeclared lifetime name `'{}`",
`265`		`- token::get_name(lifetime_ref.ident)));`
	`265`	`+ token::get_name(lifetime_ref.name)));`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`fn check_lifetime_names(&self, lifetimes: &OptVec<ast::Lifetime>) {`
`@@ -271,23 +271,23 @@ impl LifetimeContext {`
`271`	`271`
`272`	`272`	`let special_idents = [special_idents::statik];`
`273`	`273`	`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) {`
`275`	`275`	`self.sess.span_err(`
`276`	`276`	`lifetime.span,`
`277`	`277`	format!("illegal lifetime parameter name: `{}`",
`278`		`- token::get_name(lifetime.ident)));`
	`278`	`+ token::get_name(lifetime.name)));`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`for j in range(i + 1, lifetimes.len()) {`
`283`	`283`	`let lifetime_j = lifetimes.get(j);`
`284`	`284`
`285`		`- if lifetime_i.ident == lifetime_j.ident {`
	`285`	`+ if lifetime_i.name == lifetime_j.name {`
`286`	`286`	`self.sess.span_err(`
`287`	`287`	`lifetime_j.span,`
`288`	`288`	format!("lifetime name `'{}` declared twice in \
`289`	`289`	`the same scope",`
`290`		`- token::get_name(lifetime_j.ident)));`
	`290`	`+ token::get_name(lifetime_j.name)));`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`	`}`
`@@ -315,7 +315,7 @@ fn search_lifetimes(lifetimes: &OptVec<ast::Lifetime>,`
`315`	`315`	`lifetime_ref: &ast::Lifetime)`
`316`	`316`	`-> Option<(uint, ast::NodeId)> {`
`317`	`317`	`for (i, lifetime_decl) in lifetimes.iter().enumerate() {`
`318`		`- if lifetime_decl.ident == lifetime_ref.ident {`
	`318`	`+ if lifetime_decl.name == lifetime_ref.name {`
`319`	`319`	`return Some((i, lifetime_decl.id));`
`320`	`320`	`}`
`321`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,18 +92,18 @@ pub fn ast_region_to_region(tcx: ty::ctxt, lifetime: &ast::Lifetime)`
`92`	`92`
`93`	`93`	`Some(&ast::DefLateBoundRegion(binder_id, _, id)) => {`
`94`	`94`	`ty::ReLateBound(binder_id, ty::BrNamed(ast_util::local_def(id),`
`95`		`- lifetime.ident))`
	`95`	`+ lifetime.name))`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`Some(&ast::DefEarlyBoundRegion(index, id)) => {`
`99`		`- ty::ReEarlyBound(id, index, lifetime.ident)`
	`99`	`+ ty::ReEarlyBound(id, index, lifetime.name)`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`Some(&ast::DefFreeRegion(scope_id, id)) => {`
`103`	`103`	`ty::ReFree(ty::FreeRegion {`
`104`	`104`	`scope_id: scope_id,`
`105`	`105`	`bound_region: ty::BrNamed(ast_util::local_def(id),`
`106`		`- lifetime.ident)`
	`106`	`+ lifetime.name)`
`107`	`107`	`})`
`108`	`108`	`}`
`109`	`109`	`};`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ impl Lifetime {`
`333`	`333`
`334`	`334`	`impl Clean<Lifetime> for ast::Lifetime {`
`335`	`335`	`fn clean(&self) -> Lifetime {`
`336`		`- Lifetime(token::get_name(self.ident).get().to_owned())`
	`336`	`+ Lifetime(token::get_name(self.name).get().to_owned())`
`337`	`337`	`}`
`338`	`338`	`}`
`339`	`339`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ pub type FnIdent = Option<Ident>;`
`118`	`118`	`pub struct Lifetime {`
`119`	`119`	`id: NodeId,`
`120`	`120`	`span: Span,`
`121`		`- ident: Name`
	`121`	`+ name: Name`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`// a "Path" is essentially Rust's notion of a name;`
Original file line number	Diff line number	Diff line change
`@@ -413,8 +413,8 @@ impl<'a> AstBuilder for ExtCtxt<'a> {`
`413`	`413`	`ast::TraitTyParamBound(self.trait_ref(path))`
`414`	`414`	`}`
`415`	`415`
`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 }`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`fn stmt_expr(&self, expr: @ast::Expr) -> @ast::Stmt {`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ pub fn fold_lifetime<T: Folder>(l: &Lifetime, fld: &mut T) -> Lifetime {`
`435`	`435`	`Lifetime {`
`436`	`436`	`id: fld.new_id(l.id),`
`437`	`437`	`span: fld.new_span(l.span),`
`438`		`- ident: l.ident`
	`438`	`+ name: l.name`
`439`	`439`	`}`
`440`	`440`	`}`
`441`	`441`
Original file line number	Diff line number	Diff line change
`@@ -1609,7 +1609,7 @@ impl Parser {`
`1609`	`1609`	`return ast::Lifetime {`
`1610`	`1610`	`id: ast::DUMMY_NODE_ID,`
`1611`	`1611`	`span: span,`
`1612`		`- ident: i.name`
	`1612`	`+ name: i.name`
`1613`	`1613`	`};`
`1614`	`1614`	`}`
`1615`	`1615`	`_ => {`