diff options
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 415ff6a4097..e46e67d7bd3 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3237,8 +3237,7 @@ impl<'a> Parser<'a> { // These expressions are limited to literals (possibly // preceded by unary-minus) or identifiers. let val = self.parse_literal_maybe_minus(); - // FIXME(#17295) remove the DOTDOT option. - if (self.token == token::DOTDOTDOT || self.token == token::DOTDOT) && + if (self.token == token::DOTDOTDOT) && self.look_ahead(1, |t| { *t != token::COMMA && *t != token::RBRACKET }) { @@ -3283,16 +3282,12 @@ impl<'a> Parser<'a> { } }); - // FIXME(#17295) remove the DOTDOT option. - if self.look_ahead(1, |t| *t == token::DOTDOTDOT || *t == token::DOTDOT) && + if self.look_ahead(1, |t| *t == token::DOTDOTDOT) && self.look_ahead(2, |t| { *t != token::COMMA && *t != token::RBRACKET }) { let start = self.parse_expr_res(RestrictionNoBarOp); - // FIXME(#17295) remove the DOTDOT option (self.eat(&token::DOTDOTDOT)). - if self.token == token::DOTDOTDOT || self.token == token::DOTDOT { - self.bump(); - } + self.eat(&token::DOTDOTDOT); let end = self.parse_expr_res(RestrictionNoBarOp); pat = PatRange(start, end); } else if is_plain_ident(&self.token) && !can_be_enum_or_struct { |