Skip to content

Register new snapshots #15776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/librustc_back/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
//! one that doesn't; the one that doesn't might get decent parallel
//! build speedups.

#![crate_id = "rustc_back#0.11.0-pre"]
#![crate_name = "rustc_back"]
#![experimental]
#![comment = "The Rust compiler minimal-dependency dumping-ground"]
Expand All @@ -33,7 +32,6 @@
html_root_url = "http://doc.rust-lang.org/")]

#![feature(globs, phase, macro_rules)]
#![allow(unused_attribute)] // NOTE: remove after stage0

#[phase(plugin, link)]
extern crate log;
Expand Down
2 changes: 0 additions & 2 deletions src/librustc_llvm/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#![allow(non_snake_case_functions)]
#![allow(dead_code)]

#![crate_id = "rustc_llvm#0.11.0"]
#![crate_name = "rustc_llvm"]
#![experimental]
#![license = "MIT/ASL2"]
Expand All @@ -25,7 +24,6 @@

#![feature(globs)]
#![feature(link_args)]
#![allow(unused_attribute)] // NOTE: remove after stage0

extern crate libc;

Expand Down
73 changes: 9 additions & 64 deletions src/libsyntax/ast_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -766,30 +766,6 @@ pub trait PostExpansionMethod {
fn pe_vis(&self) -> ast::Visibility;
}


/// can't use the standard cfg(stage0) tricks here, because the error occurs in
/// parsing, before cfg gets a chance to save the day. (yes, interleaved parsing
/// / expansion / configuring would solve this problem...)

// NOTE: remove after next snapshot
/// to be more specific: after a snapshot, swap out the "PRE" stuff, and
// swap in the "POST" stuff.

/// PRE
macro_rules! mf_method_body{
($slf:ident, $field_pat:pat, $result:ident) => {
match $slf.node {
$field_pat => $result,
MethMac(_) => {
fail!("expected an AST without macro invocations");
}
}
}
}

/// POST
/*
#[cfg(not(stage0))]
macro_rules! mf_method{
($meth_name:ident, $field_ty:ty, $field_pat:pat, $result:ident) => {
fn $meth_name<'a>(&'a self) -> $field_ty {
Expand All @@ -801,52 +777,21 @@ macro_rules! mf_method{
}
}
}
}*/


// PRE
impl PostExpansionMethod for Method {
fn pe_ident(&self) -> ast::Ident {
mf_method_body!(self, MethDecl(ident,_,_,_,_,_,_,_),ident)
}
fn pe_generics<'a>(&'a self) -> &'a ast::Generics {
mf_method_body!(self, MethDecl(_,ref generics,_,_,_,_,_,_),generics)
}
fn pe_abi(&self) -> Abi {
mf_method_body!(self, MethDecl(_,_,abi,_,_,_,_,_),abi)
}
fn pe_explicit_self<'a>(&'a self) -> &'a ast::ExplicitSelf {
mf_method_body!(self, MethDecl(_,_,_,ref explicit_self,_,_,_,_),explicit_self)
}
fn pe_fn_style(&self) -> ast::FnStyle{
mf_method_body!(self, MethDecl(_,_,_,_,fn_style,_,_,_),fn_style)
}
fn pe_fn_decl(&self) -> P<ast::FnDecl> {
mf_method_body!(self, MethDecl(_,_,_,_,_,decl,_,_),decl)
}
fn pe_body(&self) -> P<ast::Block> {
mf_method_body!(self, MethDecl(_,_,_,_,_,_,body,_),body)
}
fn pe_vis(&self) -> ast::Visibility {
mf_method_body!(self, MethDecl(_,_,_,_,_,_,_,vis),vis)
}
}

// POST
/*
#[cfg(not(stage0))]

impl PostExpansionMethod for Method {
mf_method!(pe_ident,ast::Ident,MethDecl(ident,_,_,_,_,_,_),ident)
mf_method!(pe_ident,ast::Ident,MethDecl(ident,_,_,_,_,_,_,_),ident)
mf_method!(pe_generics,&'a ast::Generics,
MethDecl(_,ref generics,_,_,_,_,_),generics)
MethDecl(_,ref generics,_,_,_,_,_,_),generics)
mf_method!(pe_abi,Abi,MethDecl(_,_,abi,_,_,_,_,_),abi)
mf_method!(pe_explicit_self,&'a ast::ExplicitSelf,
MethDecl(_,_,ref explicit_self,_,_,_,_),explicit_self)
mf_method!(pe_fn_style,ast::FnStyle,MethDecl(_,_,_,fn_style,_,_,_),fn_style)
mf_method!(pe_fn_decl,P<ast::FnDecl>,MethDecl(_,_,_,_,decl,_,_),decl)
mf_method!(pe_body,P<ast::Block>,MethDecl(_,_,_,_,_,body,_),body)
mf_method!(pe_vis,ast::Visibility,MethDecl(_,_,_,_,_,_,vis),vis)
MethDecl(_,_,_,ref explicit_self,_,_,_,_),explicit_self)
mf_method!(pe_fn_style,ast::FnStyle,MethDecl(_,_,_,_,fn_style,_,_,_),fn_style)
mf_method!(pe_fn_decl,P<ast::FnDecl>,MethDecl(_,_,_,_,_,decl,_,_),decl)
mf_method!(pe_body,P<ast::Block>,MethDecl(_,_,_,_,_,_,body,_),body)
mf_method!(pe_vis,ast::Visibility,MethDecl(_,_,_,_,_,_,_,vis),vis)
}
*/

#[cfg(test)]
mod test {
Expand Down
26 changes: 0 additions & 26 deletions src/libsyntax/diagnostics/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,12 @@

#![macro_escape]

// NOTE: remove after next snapshot
#[cfg(stage0)]
#[macro_export]
macro_rules! __register_diagnostic(
($code:tt, $description:tt) => ();
($code:tt) => ()
)

#[macro_export]
macro_rules! register_diagnostic(
($code:tt, $description:tt) => (__register_diagnostic!($code, $description));
($code:tt) => (__register_diagnostic!($code))
)

// NOTE: remove after next snapshot
#[cfg(stage0)]
#[macro_export]
macro_rules! __build_diagnostic_array(
($name:ident) => {
pub static $name: [(&'static str, &'static str), ..0] = [];
}
)

// NOTE: remove after next snapshot
#[cfg(stage0)]
#[macro_export]
macro_rules! __diagnostic_used(
($code:ident) => {
()
}
)

#[macro_export]
macro_rules! span_err(
($session:expr, $span:expr, $code:ident, $($message:tt)*) => ({
Expand Down
1 change: 0 additions & 1 deletion src/libunicode/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
html_root_url = "http://doc.rust-lang.org/",
html_playground_url = "http://play.rust-lang.org/")]
#![no_std]
#![allow(unused_attribute)] // NOTE: remove after stage0

extern crate core;

Expand Down
8 changes: 8 additions & 0 deletions src/snapshots.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
S 2014-07-17 9fc8394
freebsd-x86_64 5a4b645e2b42ae06224cc679d4a43b3d89be1482
linux-i386 a5e1bb723020ac35173d49600e76b0935e257a6a
linux-x86_64 1a2407df17442d93d1c34c916269a345658045d7
macos-i386 6648fa88e41ad7c0991a085366e36d56005873ca
macos-x86_64 71b2d1dfd0abe1052908dc091e098ed22cf272c6
winnt-i386 c26f0a713c5fadf99cce935f60dce0ea403fb411

S 2014-07-09 8ddd286
freebsd-x86_64 de0c39057f409b69e5ddb888ba3e20b90d63f5db
linux-i386 28bef31f2a017e1998256d0c2b2e0a0c9221451b
Expand Down