libsyntax: Stop parsing const
.
This commit is contained in:
parent
85c9fc6f8f
commit
68cb53672b
2 changed files with 13 additions and 1 deletions
|
@ -60,6 +60,7 @@ pub enum ObsoleteSyntax {
|
||||||
ObsoleteConstManagedPointer,
|
ObsoleteConstManagedPointer,
|
||||||
ObsoletePurity,
|
ObsoletePurity,
|
||||||
ObsoleteStaticMethod,
|
ObsoleteStaticMethod,
|
||||||
|
ObsoleteConstItem,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl to_bytes::IterBytes for ObsoleteSyntax {
|
impl to_bytes::IterBytes for ObsoleteSyntax {
|
||||||
|
@ -203,6 +204,11 @@ pub impl Parser {
|
||||||
"`static` notation",
|
"`static` notation",
|
||||||
"`static` is superfluous; remove it"
|
"`static` is superfluous; remove it"
|
||||||
),
|
),
|
||||||
|
ObsoleteConstItem => (
|
||||||
|
"`const` item",
|
||||||
|
"`const` items are now `static` items; replace `const` with \
|
||||||
|
`static`"
|
||||||
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
self.report(sp, kind, kind_str, desc);
|
self.report(sp, kind, kind_str, desc);
|
||||||
|
|
|
@ -81,6 +81,7 @@ use parse::obsolete::{ObsoleteBareFnType, ObsoleteNewtypeEnum};
|
||||||
use parse::obsolete::{ObsoleteMode, ObsoleteImplicitSelf};
|
use parse::obsolete::{ObsoleteMode, ObsoleteImplicitSelf};
|
||||||
use parse::obsolete::{ObsoleteLifetimeNotation, ObsoleteConstManagedPointer};
|
use parse::obsolete::{ObsoleteLifetimeNotation, ObsoleteConstManagedPointer};
|
||||||
use parse::obsolete::{ObsoletePurity, ObsoleteStaticMethod};
|
use parse::obsolete::{ObsoletePurity, ObsoleteStaticMethod};
|
||||||
|
use parse::obsolete::{ObsoleteConstItem};
|
||||||
use parse::prec::{as_prec, token_to_binop};
|
use parse::prec::{as_prec, token_to_binop};
|
||||||
use parse::token::{can_begin_expr, is_ident, is_ident_or_path};
|
use parse::token::{can_begin_expr, is_ident, is_ident_or_path};
|
||||||
use parse::token::{is_plain_ident, INTERPOLATED, special_idents};
|
use parse::token::{is_plain_ident, INTERPOLATED, special_idents};
|
||||||
|
@ -3563,7 +3564,9 @@ pub impl Parser {
|
||||||
let lo = self.span.lo;
|
let lo = self.span.lo;
|
||||||
|
|
||||||
// XXX: Obsolete; remove after snap.
|
// XXX: Obsolete; remove after snap.
|
||||||
if !self.eat_keyword(&~"const") {
|
if self.eat_keyword(&~"const") {
|
||||||
|
self.obsolete(*self.last_span, ObsoleteConstItem);
|
||||||
|
} else {
|
||||||
self.expect_keyword(&~"static");
|
self.expect_keyword(&~"static");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3959,6 +3962,9 @@ pub impl Parser {
|
||||||
(self.is_keyword(&~"static") &&
|
(self.is_keyword(&~"static") &&
|
||||||
!self.token_is_keyword(&~"fn", &self.look_ahead(1)))) {
|
!self.token_is_keyword(&~"fn", &self.look_ahead(1)))) {
|
||||||
// CONST ITEM
|
// CONST ITEM
|
||||||
|
if self.is_keyword(&~"const") {
|
||||||
|
self.obsolete(*self.span, ObsoleteConstItem);
|
||||||
|
}
|
||||||
self.bump();
|
self.bump();
|
||||||
let (ident, item_, extra_attrs) = self.parse_item_const();
|
let (ident, item_, extra_attrs) = self.parse_item_const();
|
||||||
return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_,
|
return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue