diff options
| author | bors <bors@rust-lang.org> | 2013-11-28 20:31:39 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-28 20:31:39 -0800 |
| commit | bf6964ecb67f4ffce6be75130ab7a3be793960ff (patch) | |
| tree | ddf8aabea4d05b3ae0cb977cc1a466526f871b06 /src/libsyntax/parse/token.rs | |
| parent | 90d06ecf6b26e949921778f0d479ea1532077200 (diff) | |
| parent | ab387a68388974a432951e806851936898907fd0 (diff) | |
| download | rust-bf6964ecb67f4ffce6be75130ab7a3be793960ff.tar.gz rust-bf6964ecb67f4ffce6be75130ab7a3be793960ff.zip | |
auto merge of #10709 : alexcrichton/rust/snapshot, r=pcwalton
Diffstat (limited to 'src/libsyntax/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 4ad2c9a32c9..8f8b956315f 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -217,17 +217,17 @@ pub fn to_str(input: @ident_interner, t: &Token) -> ~str { _ => { ~"an interpolated " + match (*nt) { - nt_item(*) => ~"item", - nt_block(*) => ~"block", - nt_stmt(*) => ~"statement", - nt_pat(*) => ~"pattern", - nt_attr(*) => fail!("should have been handled"), - nt_expr(*) => fail!("should have been handled above"), - nt_ty(*) => ~"type", - nt_ident(*) => ~"identifier", - nt_path(*) => ~"path", - nt_tt(*) => ~"tt", - nt_matchers(*) => ~"matcher sequence" + nt_item(..) => ~"item", + nt_block(..) => ~"block", + nt_stmt(..) => ~"statement", + nt_pat(..) => ~"pattern", + nt_attr(..) => fail!("should have been handled"), + nt_expr(..) => fail!("should have been handled above"), + nt_ty(..) => ~"type", + nt_ident(..) => ~"identifier", + nt_path(..) => ~"path", + nt_tt(..) => ~"tt", + nt_matchers(..) => ~"matcher sequence" } } } @@ -260,10 +260,10 @@ pub fn can_begin_expr(t: &Token) -> bool { BINOP(OR) => true, // in lambda syntax OROR => true, // in lambda syntax MOD_SEP => true, - INTERPOLATED(nt_expr(*)) - | INTERPOLATED(nt_ident(*)) - | INTERPOLATED(nt_block(*)) - | INTERPOLATED(nt_path(*)) => true, + INTERPOLATED(nt_expr(..)) + | INTERPOLATED(nt_ident(..)) + | INTERPOLATED(nt_block(..)) + | INTERPOLATED(nt_path(..)) => true, _ => false } } @@ -303,7 +303,7 @@ pub fn is_ident(t: &Token) -> bool { pub fn is_ident_or_path(t: &Token) -> bool { match *t { - IDENT(_, _) | INTERPOLATED(nt_path(*)) => true, + IDENT(_, _) | INTERPOLATED(nt_path(..)) => true, _ => false } } |
