diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2014-03-07 03:10:52 +0100 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2014-03-12 08:02:32 +0100 |
| commit | 189c0085d19c2cbd8e3b6ca8274e2cab60aad515 (patch) | |
| tree | 4fa2100ae551ed65fbf4c138dd9c53253229f559 /src/libsyntax | |
| parent | 460ca4f037e4896f103889b694dd2971e3141eac (diff) | |
| download | rust-189c0085d19c2cbd8e3b6ca8274e2cab60aad515.tar.gz rust-189c0085d19c2cbd8e3b6ca8274e2cab60aad515.zip | |
alpha-rename .ident to .name in Lifetime, including in rustdoc.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/build.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/fold.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 0a959993517..372641af5f8 100644 --- 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 index 8296ee34c54..e644eca8f7d 100644 --- 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 index df6b06c5804..99e7b6a7ab1 100644 --- 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 index 9e5db1770bf..b6f813269cf 100644 --- 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 index c8bd87024e8..f80fc78b79c 100644 --- 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 index aafda9d687d..45ab4c6956a 100644 --- 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, |