diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-07-31 17:23:22 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-07-31 20:18:26 -0400 |
| commit | 4bad51585424cee9c97491c1aed7cf27a3cdcb68 (patch) | |
| tree | 15fe5bdb4a205fcc15cd14b7bc9f608b872d27a0 /src/libsyntax/parse | |
| parent | e07e49ea8fa0c0666a1b59ff1238f995ce84722c (diff) | |
| download | rust-4bad51585424cee9c97491c1aed7cf27a3cdcb68.tar.gz rust-4bad51585424cee9c97491c1aed7cf27a3cdcb68.zip | |
rm ancient error for lowercase kinds
3 of these kinds no longer even exist in the CamelCase form
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/obsolete.rs | 7 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 28 |
2 files changed, 3 insertions, 32 deletions
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, } |
