rm ancient error for lowercase kinds
3 of these kinds no longer even exist in the CamelCase form
This commit is contained in:
parent
e07e49ea8f
commit
4bad515854
3 changed files with 3 additions and 44 deletions
|
@ -30,7 +30,6 @@ use std::to_bytes;
|
||||||
/// The specific types of unsupported syntax
|
/// The specific types of unsupported syntax
|
||||||
#[deriving(Eq)]
|
#[deriving(Eq)]
|
||||||
pub enum ObsoleteSyntax {
|
pub enum ObsoleteSyntax {
|
||||||
ObsoleteLowerCaseKindBounds,
|
|
||||||
ObsoleteLet,
|
ObsoleteLet,
|
||||||
ObsoleteFieldTerminator,
|
ObsoleteFieldTerminator,
|
||||||
ObsoleteStructCtor,
|
ObsoleteStructCtor,
|
||||||
|
@ -96,12 +95,6 @@ impl ParserObsoleteMethods for Parser {
|
||||||
/// Reports an obsolete syntax non-fatal error.
|
/// Reports an obsolete syntax non-fatal error.
|
||||||
pub fn obsolete(&self, sp: span, kind: ObsoleteSyntax) {
|
pub fn obsolete(&self, sp: span, kind: ObsoleteSyntax) {
|
||||||
let (kind_str, desc) = match kind {
|
let (kind_str, desc) = match kind {
|
||||||
ObsoleteLowerCaseKindBounds => (
|
|
||||||
"lower-case kind bounds",
|
|
||||||
"the `send`, `copy`, `const`, and `owned` \
|
|
||||||
kinds are represented as traits now, and \
|
|
||||||
should be camel cased"
|
|
||||||
),
|
|
||||||
ObsoleteLet => (
|
ObsoleteLet => (
|
||||||
"`let` in field declaration",
|
"`let` in field declaration",
|
||||||
"declare fields as `field: Type`"
|
"declare fields as `field: Type`"
|
||||||
|
|
|
@ -71,7 +71,7 @@ use parse::lexer::TokenAndSpan;
|
||||||
use parse::obsolete::{ObsoleteClassTraits};
|
use parse::obsolete::{ObsoleteClassTraits};
|
||||||
use parse::obsolete::{ObsoleteLet, ObsoleteFieldTerminator};
|
use parse::obsolete::{ObsoleteLet, ObsoleteFieldTerminator};
|
||||||
use parse::obsolete::{ObsoleteMoveInit, ObsoleteBinaryMove, ObsoleteSwap};
|
use parse::obsolete::{ObsoleteMoveInit, ObsoleteBinaryMove, ObsoleteSwap};
|
||||||
use parse::obsolete::{ObsoleteSyntax, ObsoleteLowerCaseKindBounds};
|
use parse::obsolete::ObsoleteSyntax;
|
||||||
use parse::obsolete::{ObsoleteUnsafeBlock, ObsoleteImplSyntax};
|
use parse::obsolete::{ObsoleteUnsafeBlock, ObsoleteImplSyntax};
|
||||||
use parse::obsolete::{ObsoleteMutOwnedPointer};
|
use parse::obsolete::{ObsoleteMutOwnedPointer};
|
||||||
use parse::obsolete::{ObsoleteMutVector, ObsoleteImplVisibility};
|
use parse::obsolete::{ObsoleteMutVector, ObsoleteImplVisibility};
|
||||||
|
@ -3309,30 +3309,8 @@ impl Parser {
|
||||||
self.bump();
|
self.bump();
|
||||||
}
|
}
|
||||||
token::MOD_SEP | token::IDENT(*) => {
|
token::MOD_SEP | token::IDENT(*) => {
|
||||||
let obsolete_bound = match *self.token {
|
let tref = self.parse_trait_ref();
|
||||||
token::MOD_SEP => false,
|
result.push(TraitTyParamBound(tref));
|
||||||
token::IDENT(sid, _) => {
|
|
||||||
match self.id_to_str(sid).as_slice() {
|
|
||||||
"send" |
|
|
||||||
"copy" |
|
|
||||||
"const" |
|
|
||||||
"owned" => {
|
|
||||||
self.obsolete(
|
|
||||||
*self.span,
|
|
||||||
ObsoleteLowerCaseKindBounds);
|
|
||||||
self.bump();
|
|
||||||
true
|
|
||||||
}
|
|
||||||
_ => false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => fail!()
|
|
||||||
};
|
|
||||||
|
|
||||||
if !obsolete_bound {
|
|
||||||
let tref = self.parse_trait_ref();
|
|
||||||
result.push(TraitTyParamBound(tref));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
_ => break,
|
_ => break,
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,18 +8,6 @@
|
||||||
// option. This file may not be copied, modified, or distributed
|
// option. This file may not be copied, modified, or distributed
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
fn f1<T:copy>() -> T { }
|
|
||||||
//~^ ERROR obsolete syntax: lower-case kind bounds
|
|
||||||
|
|
||||||
fn f1<T:send>() -> T { }
|
|
||||||
//~^ ERROR obsolete syntax: lower-case kind bounds
|
|
||||||
|
|
||||||
fn f1<T:const>() -> T { }
|
|
||||||
//~^ ERROR obsolete syntax: lower-case kind bounds
|
|
||||||
|
|
||||||
fn f1<T:owned>() -> T { }
|
|
||||||
//~^ ERROR obsolete syntax: lower-case kind bounds
|
|
||||||
|
|
||||||
struct s {
|
struct s {
|
||||||
let foo: (),
|
let foo: (),
|
||||||
//~^ ERROR obsolete syntax: `let` in field declaration
|
//~^ ERROR obsolete syntax: `let` in field declaration
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue