diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs index 7e0081bdb68..3472b9f1d67 100644 --- a/src/libsyntax/parse/obsolete.rs +++ b/src/libsyntax/parse/obsolete.rs @@ -30,7 +30,6 @@ use std::to_bytes; /// The specific types of unsupported syntax #[deriving(Eq)] pub enum ObsoleteSyntax { - ObsoleteLowerCaseKindBounds, ObsoleteLet, ObsoleteFieldTerminator, ObsoleteStructCtor, @@ -96,12 +95,6 @@ impl ParserObsoleteMethods for Parser { /// Reports an obsolete syntax non-fatal error. pub fn obsolete(&self, sp: span, kind: ObsoleteSyntax) { 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 => ( "`let` in field declaration", "declare fields as `field: Type`" diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 6ff4b91ec97..9444c463686 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -71,7 +71,7 @@ use parse::lexer::TokenAndSpan; use parse::obsolete::{ObsoleteClassTraits}; use parse::obsolete::{ObsoleteLet, ObsoleteFieldTerminator}; use parse::obsolete::{ObsoleteMoveInit, ObsoleteBinaryMove, ObsoleteSwap}; -use parse::obsolete::{ObsoleteSyntax, ObsoleteLowerCaseKindBounds}; +use parse::obsolete::ObsoleteSyntax; use parse::obsolete::{ObsoleteUnsafeBlock, ObsoleteImplSyntax}; use parse::obsolete::{ObsoleteMutOwnedPointer}; use parse::obsolete::{ObsoleteMutVector, ObsoleteImplVisibility}; @@ -3309,30 +3309,8 @@ impl Parser { self.bump(); } token::MOD_SEP | token::IDENT(*) => { - let obsolete_bound = match *self.token { - token::MOD_SEP => false, - 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)); - } + let tref = self.parse_trait_ref(); + result.push(TraitTyParamBound(tref)); } _ => break, } diff --git a/src/test/compile-fail/obsolete-syntax.rs b/src/test/compile-fail/obsolete-syntax.rs index 706a64a99ac..8ba5e2815a5 100644 --- a/src/test/compile-fail/obsolete-syntax.rs +++ b/src/test/compile-fail/obsolete-syntax.rs @@ -8,18 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn f1() -> T { } -//~^ ERROR obsolete syntax: lower-case kind bounds - -fn f1() -> T { } -//~^ ERROR obsolete syntax: lower-case kind bounds - -fn f1() -> T { } -//~^ ERROR obsolete syntax: lower-case kind bounds - -fn f1() -> T { } -//~^ ERROR obsolete syntax: lower-case kind bounds - struct s { let foo: (), //~^ ERROR obsolete syntax: `let` in field declaration