Skip to content

Commit b57f109

Browse files
committed
Remove parsing of obsolete pre-1.0 syntaxes
1 parent 03161e9 commit b57f109

File tree

3 files changed

+4
-62
lines changed

3 files changed

+4
-62
lines changed

src/libsyntax/parse/obsolete.rs

+3-12
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ use parse::parser;
1919
/// The specific types of unsupported syntax
2020
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
2121
pub enum ObsoleteSyntax {
22-
ClosureKind,
23-
ExternCrateString,
22+
// Nothing here at the moment
2423
}
2524

2625
pub trait ParserObsoleteMethods {
@@ -36,18 +35,10 @@ pub trait ParserObsoleteMethods {
3635

3736
impl<'a> ParserObsoleteMethods for parser::Parser<'a> {
3837
/// Reports an obsolete syntax non-fatal error.
38+
#[allow(unused_variables)]
3939
fn obsolete(&mut self, sp: Span, kind: ObsoleteSyntax) {
4040
let (kind_str, desc, error) = match kind {
41-
ObsoleteSyntax::ClosureKind => (
42-
"`:`, `&mut:`, or `&:`",
43-
"rely on inference instead",
44-
true,
45-
),
46-
ObsoleteSyntax::ExternCrateString => (
47-
"\"crate-name\"",
48-
"use an identifier not in quotes instead",
49-
false, // warning for now
50-
),
41+
// Nothing here at the moment
5142
};
5243

5344
self.report(sp, kind, kind_str, desc, error);

src/libsyntax/parse/parser.rs

+1-32
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use parse;
4747
use parse::classify;
4848
use parse::common::SeqSep;
4949
use parse::lexer::{Reader, TokenAndSpan};
50-
use parse::obsolete::{ParserObsoleteMethods, ObsoleteSyntax};
50+
use parse::obsolete::ObsoleteSyntax;
5151
use parse::token::{self, intern, MatchNt, SubstNt, SpecialVarNt, InternedString};
5252
use parse::token::{keywords, SpecialMacroVar};
5353
use parse::{new_sub_parser_from_file, ParseSess};
@@ -1165,36 +1165,6 @@ impl<'a> Parser<'a> {
11651165
})))
11661166
}
11671167

1168-
/// Parses an obsolete closure kind (`&:`, `&mut:`, or `:`).
1169-
pub fn parse_obsolete_closure_kind(&mut self) -> PResult<'a, ()> {
1170-
let lo = self.span.lo;
1171-
if
1172-
self.check(&token::BinOp(token::And)) &&
1173-
self.look_ahead(1, |t| t.is_keyword(keywords::Mut)) &&
1174-
self.look_ahead(2, |t| *t == token::Colon)
1175-
{
1176-
self.bump();
1177-
self.bump();
1178-
self.bump();
1179-
} else if
1180-
self.token == token::BinOp(token::And) &&
1181-
self.look_ahead(1, |t| *t == token::Colon)
1182-
{
1183-
self.bump();
1184-
self.bump();
1185-
} else if
1186-
self.eat(&token::Colon)
1187-
{
1188-
/* nothing */
1189-
} else {
1190-
return Ok(());
1191-
}
1192-
1193-
let span = mk_sp(lo, self.span.hi);
1194-
self.obsolete(span, ObsoleteSyntax::ClosureKind);
1195-
Ok(())
1196-
}
1197-
11981168
pub fn parse_unsafety(&mut self) -> PResult<'a, Unsafety> {
11991169
if self.eat_keyword(keywords::Unsafe) {
12001170
return Ok(Unsafety::Unsafe);
@@ -4728,7 +4698,6 @@ impl<'a> Parser<'a> {
47284698
Vec::new()
47294699
} else {
47304700
self.expect(&token::BinOp(token::Or))?;
4731-
self.parse_obsolete_closure_kind()?;
47324701
let args = self.parse_seq_to_before_end(
47334702
&token::BinOp(token::Or),
47344703
SeqSep::trailing_allowed(token::Comma),

src/test/parse-fail/obsolete-closure-kind.rs

-18
This file was deleted.

0 commit comments

Comments
 (0)