bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove parsing of obsolete pre-1.0 syntaxes

Browse source
This commit is contained in:
Vadim Petrochenkov 2016-08-26 19:23:42 +03:00
parent 03161e9b12
commit b57f1099b5
3 changed files with 4 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/libsyntax/parse/parser.rs
View file

@ -47,7 +47,7 @@ use parse;
use parse::classify;
use parse::common::SeqSep;
use parse::lexer::{Reader, TokenAndSpan};
use parse::obsolete::{ParserObsoleteMethods, ObsoleteSyntax};
use parse::obsolete::ObsoleteSyntax;
use parse::token::{self, intern, MatchNt, SubstNt, SpecialVarNt, InternedString};
use parse::token::{keywords, SpecialMacroVar};
use parse::{new_sub_parser_from_file, ParseSess};
@ -1165,36 +1165,6 @@ impl<'a> Parser<'a> {
})))
}
/// Parses an obsolete closure kind (`&:`, `&mut:`, or `:`).
pub fn parse_obsolete_closure_kind(&mut self) -> PResult<'a, ()> {
let lo = self.span.lo;
if
self.check(&token::BinOp(token::And)) &&
self.look_ahead(1, |t| t.is_keyword(keywords::Mut)) &&
self.look_ahead(2, |t| *t == token::Colon)
{
self.bump();
self.bump();
self.bump();
} else if
self.token == token::BinOp(token::And) &&
self.look_ahead(1, |t| *t == token::Colon)
{
self.bump();
self.bump();
} else if
self.eat(&token::Colon)
{
/* nothing */
} else {
return Ok(());
}
let span = mk_sp(lo, self.span.hi);
self.obsolete(span, ObsoleteSyntax::ClosureKind);
Ok(())
}
pub fn parse_unsafety(&mut self) -> PResult<'a, Unsafety> {
if self.eat_keyword(keywords::Unsafe) {
return Ok(Unsafety::Unsafe);
@ -4728,7 +4698,6 @@ impl<'a> Parser<'a> {
Vec::new()
} else {
self.expect(&token::BinOp(token::Or))?;
self.parse_obsolete_closure_kind()?;
let args = self.parse_seq_to_before_end(
&token::BinOp(token::Or),
SeqSep::trailing_allowed(token::Comma),