about summary refs log tree commit diff
path: root/src/libsyntax/parse/token.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-01-18 11:28:53 +0000
committerbors <bors@rust-lang.org>2015-01-18 11:28:53 +0000
commitdcaeb6aa23ecba2dc2af870668a9239136d20fa3 (patch)
treea1702f3eae2c0e1f487d1236271d0ec9f84403c8 /src/libsyntax/parse/token.rs
parent30f081e54843952e34b0632e1b0ec54547bf6e3c (diff)
parentca8578a953d0563dbef499ea2c2c853c9b71887c (diff)
downloadrust-dcaeb6aa23ecba2dc2af870668a9239136d20fa3.tar.gz
rust-dcaeb6aa23ecba2dc2af870668a9239136d20fa3.zip
auto merge of #20901 : dgrunwald/rust/update-token-can-begin-expr, r=sanxiyn
 * add `Token::AndAnd` (double borrow)
 * add `Token::DotDot` (range notation)
 * remove `Token::Pound` and `Token::At`

This fixes a syntax error when parsing `fn f() -> RangeTo<i32> { return ..1; }`.

Also, remove `fn_expr_lookahead`.
It's from the `fn~` days and seems to no longer be necessary.
Diffstat (limited to 'src/libsyntax/parse/token.rs')
-rw-r--r--src/libsyntax/parse/token.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 4b3573f84c5..e5aef12e827 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -183,14 +183,14 @@ impl Token {
             Underscore                  => true,
             Tilde                       => true,
             Literal(_, _)               => true,
-            Pound                       => true,
-            At                          => true,
             Not                         => true,
             BinOp(Minus)                => true,
             BinOp(Star)                 => true,
             BinOp(And)                  => true,
             BinOp(Or)                   => true, // in lambda syntax
             OrOr                        => true, // in lambda syntax
+            AndAnd                      => true, // double borrow
+            DotDot                      => true, // range notation
             ModSep                      => true,
             Interpolated(NtExpr(..))    => true,
             Interpolated(NtIdent(..))   => true,