From 89b0e6e12ba2fb24ec0e6655a1130c16eb8d1745 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 14 Jun 2014 11:03:34 -0700 Subject: Register new snapshots --- src/libsyntax/crateid.rs | 17 ----------------- src/libsyntax/diagnostic.rs | 10 +++++----- src/libsyntax/ext/asm.rs | 23 ----------------------- src/libsyntax/ext/base.rs | 4 ++-- src/libsyntax/parse/attr.rs | 7 ------- src/libsyntax/parse/parser.rs | 41 ++++------------------------------------- 6 files changed, 11 insertions(+), 91 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/crateid.rs b/src/libsyntax/crateid.rs index d5e0a4e80d4..8ac54a191f2 100644 --- a/src/libsyntax/crateid.rs +++ b/src/libsyntax/crateid.rs @@ -32,23 +32,6 @@ pub struct CrateId { } impl fmt::Show for CrateId { - #[cfg(stage0)] - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "{}", self.path)); - let version = match self.version { - None => "0.0", - Some(ref version) => version.as_slice(), - }; - if self.path == self.name || - self.path - .as_slice() - .ends_with(format!("/{}", self.name).as_slice()) { - write!(f, "\\#{}", version) - } else { - write!(f, "\\#{}:{}", self.name, version) - } - } - #[cfg(not(stage0))] fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { try!(write!(f, "{}", self.path)); let version = match self.version { diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs index ee06efbec13..16c463f0c96 100644 --- a/src/libsyntax/diagnostic.rs +++ b/src/libsyntax/diagnostic.rs @@ -118,7 +118,7 @@ impl SpanHandler { // others log errors for later reporting. pub struct Handler { err_count: Cell, - emit: RefCell>, + emit: RefCell>, } impl Handler { @@ -187,7 +187,7 @@ pub fn default_handler(color_config: ColorConfig) -> Handler { mk_handler(box EmitterWriter::stderr(color_config)) } -pub fn mk_handler(e: Box) -> Handler { +pub fn mk_handler(e: Box) -> Handler { Handler { err_count: Cell::new(0), emit: RefCell::new(e), @@ -281,8 +281,8 @@ pub struct EmitterWriter { } enum Destination { - Terminal(Box>:Send>), - Raw(Box), + Terminal(Box> + Send>), + Raw(Box), } impl EmitterWriter { @@ -306,7 +306,7 @@ impl EmitterWriter { } } - pub fn new(dst: Box) -> EmitterWriter { + pub fn new(dst: Box) -> EmitterWriter { EmitterWriter { dst: Raw(dst) } } } diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 7aa93dee11d..50b1639484d 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -145,29 +145,6 @@ pub fn expand_asm(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) inputs.push((constraint, input)); } } - #[cfg(stage0)] - Clobbers => { - let mut clobs = Vec::new(); - while p.token != token::EOF && - p.token != token::COLON && - p.token != token::MOD_SEP { - - if clobs.len() != 0 { - p.eat(&token::COMMA); - } - - let (s, _str_style) = p.parse_str(); - let clob = format!("~\\{{}\\}", s); - clobs.push(clob); - - if OPTIONS.iter().any(|opt| s.equiv(opt)) { - cx.span_warn(p.last_span, "expected a clobber, but found an option"); - } - } - - cons = clobs.connect(","); - } - #[cfg(not(stage0))] Clobbers => { let mut clobs = Vec::new(); while p.token != token::EOF && diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 421f8b1294d..960894e6963 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -257,13 +257,13 @@ pub enum SyntaxExtension { /// A normal, function-like syntax extension. /// /// `bytes!` is a `NormalTT`. - NormalTT(Box, Option), + NormalTT(Box, Option), /// A function-like syntax extension that has an extra ident before /// the block. /// /// `macro_rules!` is an `IdentTT`. - IdentTT(Box, Option), + IdentTT(Box, Option), } pub type NamedSyntaxExtension = (Name, SyntaxExtension); diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index f48ddf4417b..e47080dadfd 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -90,13 +90,6 @@ impl<'a> ParserAttr for Parser<'a> { let hi = self.span.hi; (mk_sp(lo, hi), meta_item, style) } - #[cfg(stage0)] - _ => { - let token_str = self.this_token_to_str(); - self.fatal(format!("expected `\\#` but found `{}`", - token_str).as_slice()); - } - #[cfg(not(stage0))] _ => { let token_str = self.this_token_to_str(); self.fatal(format!("expected `#` but found `{}`", diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index ae3b8587ee5..8b50a6270bc 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -302,7 +302,7 @@ pub struct Parser<'a> { pub tokens_consumed: uint, pub restriction: restriction, pub quote_depth: uint, // not (yet) related to the quasiquoter - pub reader: Box, + pub reader: Box, pub interner: Rc, /// The set of seen errors about obsolete syntax. Used to suppress /// extra detail when the same error is seen twice @@ -325,7 +325,8 @@ fn is_plain_ident_or_underscore(t: &token::Token) -> bool { } impl<'a> Parser<'a> { - pub fn new(sess: &'a ParseSess, cfg: ast::CrateConfig, mut rdr: Box) -> Parser<'a> { + pub fn new(sess: &'a ParseSess, cfg: ast::CrateConfig, + mut rdr: Box) -> Parser<'a> { let tok0 = rdr.next_token(); let span = tok0.sp; let placeholder = TokenAndSpan { @@ -1232,13 +1233,6 @@ impl<'a> Parser<'a> { }) } - #[cfg(stage0)] - _ => { - let token_str = p.this_token_to_str(); - p.fatal((format!("expected `;` or `\\{` but found `{}`", - token_str)).as_slice()) - } - #[cfg(not(stage0))] _ => { let token_str = p.this_token_to_str(); p.fatal((format!("expected `;` or `{{` but found `{}`", @@ -1645,12 +1639,9 @@ impl<'a> Parser<'a> { } // Next, parse a plus and bounded type parameters, if applicable. - // - // NOTE(stage0, pcwalton): Remove `token::COLON` after a snapshot. let bounds = if mode == LifetimeAndTypesAndBounds { let bounds = { - if self.eat(&token::BINOP(token::PLUS)) || - self.eat(&token::COLON) { + if self.eat(&token::BINOP(token::PLUS)) { let (_, bounds) = self.parse_ty_param_bounds(false); Some(bounds) } else { @@ -3208,21 +3199,6 @@ impl<'a> Parser<'a> { // consuming more tokens). let (bra, ket) = match token::close_delimiter_for(&self.token) { Some(ket) => (self.token.clone(), ket), - #[cfg(stage0)] - None => { - // we only expect an ident if we didn't parse one - // above. - let ident_str = if id == token::special_idents::invalid { - "identifier, " - } else { - "" - }; - let tok_str = self.this_token_to_str(); - self.fatal(format!("expected {}`(` or `\\{`, but found `{}`", - ident_str, - tok_str).as_slice()) - } - #[cfg(not(stage0))] None => { // we only expect an ident if we didn't parse one // above. @@ -4153,15 +4129,6 @@ impl<'a> Parser<'a> { self.bump(); } token::RBRACE => {} - #[cfg(stage0)] - _ => { - let span = self.span; - let token_str = self.this_token_to_str(); - self.span_fatal(span, - format!("expected `,`, or `\\}` but found `{}`", - token_str).as_slice()) - } - #[cfg(not(stage0))] _ => { let span = self.span; let token_str = self.this_token_to_str(); -- cgit 1.4.1-3-g733a5