From e7dbe6cd6f40b5360d6121ce9dba9803f2cf3233 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 21 Mar 2013 18:10:20 -0700 Subject: [PATCH] librustc: Register new snapshots --- src/libcore/comm.rs | 12 ----------- src/libcore/core.rc | 33 ------------------------------- src/libcore/io.rs | 6 ------ src/librustc/front/test.rs | 18 ----------------- src/librustc/middle/trans/expr.rs | 27 ------------------------- src/libstd/comm.rs | 3 --- src/snapshots.txt | 8 ++++++++ 7 files changed, 8 insertions(+), 99 deletions(-) diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs index 255e1966f37..692a7947e20 100644 --- a/src/libcore/comm.rs +++ b/src/libcore/comm.rs @@ -108,9 +108,6 @@ pub fn stream() -> (Port, Chan) { // Add an inherent method so that imports of GenericChan are not // required. -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] pub impl Chan { fn send(&self, x: T) { chan_send(self, x) } fn try_send(&self, x: T) -> bool { chan_try_send(self, x) } @@ -148,9 +145,6 @@ fn chan_try_send(self: &Chan, x: T) -> bool { } // Use an inherent impl so that imports are not required: -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] pub impl Port { fn recv(&self) -> T { port_recv(self) } fn try_recv(&self) -> Option { port_try_recv(self) } @@ -226,9 +220,6 @@ pub fn PortSet() -> PortSet{ } // Use an inherent impl so that imports are not required: -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] pub impl PortSet { fn recv(&self) -> T { port_set_recv(self) } fn try_recv(&self) -> Option { port_set_try_recv(self) } @@ -302,9 +293,6 @@ pure fn port_set_peek(self: &PortSet) -> bool { /// A channel that can be shared between many senders. pub type SharedChan = unstable::Exclusive>; -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] pub impl SharedChan { fn send(&self, x: T) { shared_chan_send(self, x) } fn try_send(&self, x: T) -> bool { shared_chan_try_send(self, x) } diff --git a/src/libcore/core.rc b/src/libcore/core.rc index 955c1f46d76..96457f76bb9 100644 --- a/src/libcore/core.rc +++ b/src/libcore/core.rc @@ -212,34 +212,10 @@ pub use to_str::ToStr; pub use clone::Clone; -/* - * Export the log levels as global constants. Higher levels mean - * more-verbosity. Error is the bottom level, default logging level is - * warn-and-below. - */ -/// The error log level -#[cfg(stage0)] -pub const error : u32 = 1_u32; -/// The warning log level -#[cfg(stage0)] -pub const warn : u32 = 2_u32; -/// The info log level -#[cfg(stage0)] -pub const info : u32 = 3_u32; -/// The debug log level -#[cfg(stage0)] -pub const debug : u32 = 4_u32; - - /* Unsupported interfaces */ // Private APIs pub mod unstable; -// NOTE: Remove after snapshot -#[cfg(stage0)] -pub mod private { - pub use super::unstable::extfmt; -} /* For internal use, not exported */ @@ -255,15 +231,6 @@ pub mod rt; // can be resolved within libcore. #[doc(hidden)] pub mod core { - #[cfg(stage0)] - pub const error : u32 = 1_u32; - #[cfg(stage0)] - pub const warn : u32 = 2_u32; - #[cfg(stage0)] - pub const info : u32 = 3_u32; - #[cfg(stage0)] - pub const debug : u32 = 4_u32; - pub use cmp; pub use condition; pub use option; diff --git a/src/libcore/io.rs b/src/libcore/io.rs index 7fd61c48207..ffa278bb8f2 100644 --- a/src/libcore/io.rs +++ b/src/libcore/io.rs @@ -75,9 +75,6 @@ pub trait Reader { fn tell(&self) -> uint; } -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] impl Reader for @Reader { fn read(&self, bytes: &mut [u8], len: uint) -> uint { self.read(bytes, len) @@ -658,9 +655,6 @@ pub trait Writer { fn get_type(&self) -> WriterType; } -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] impl Writer for @Writer { fn write(&self, v: &[const u8]) { self.write(v) } fn seek(&self, a: int, b: SeekStyle) { self.seek(a, b) } diff --git a/src/librustc/front/test.rs b/src/librustc/front/test.rs index 8b08f5e4532..d7c1bc9b2d3 100644 --- a/src/librustc/front/test.rs +++ b/src/librustc/front/test.rs @@ -352,24 +352,6 @@ fn path_node_global(+ids: ~[ast::ident]) -> @ast::path { types: ~[] } } -#[cfg(stage0)] -fn mk_tests(cx: &TestCtxt) -> @ast::item { - - let ext_cx = cx.ext_cx; - - // The vector of test_descs for this crate - let test_descs = mk_test_descs(cx); - - (quote_item!( - pub const tests : &static/[self::std::test::TestDescAndFn] = - $test_descs - ; - )).get() -} - -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] fn mk_tests(cx: &TestCtxt) -> @ast::item { let ext_cx = cx.ext_cx; diff --git a/src/librustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs index fb63f5384fb..af3464c94a8 100644 --- a/src/librustc/middle/trans/expr.rs +++ b/src/librustc/middle/trans/expr.rs @@ -1085,15 +1085,6 @@ fn trans_lvalue_unadjusted(bcx: block, expr: @ast::expr) -> DatumBlock { ast::def_const(did) => { let const_ty = expr_ty(bcx, ref_expr); - #[cfg(stage0)] - fn get_did(_ccx: @CrateContext, did: ast::def_id) - -> ast::def_id { - did - } - - #[cfg(stage1)] - #[cfg(stage2)] - #[cfg(stage3)] fn get_did(ccx: @CrateContext, did: ast::def_id) -> ast::def_id { if did.crate != ast::local_crate { @@ -1103,24 +1094,6 @@ fn trans_lvalue_unadjusted(bcx: block, expr: @ast::expr) -> DatumBlock { } } - #[cfg(stage0)] - fn get_val(bcx: block, did: ast::def_id, const_ty: ty::t) - -> ValueRef { - let ccx = bcx.ccx(); - if did.crate == ast::local_crate { - // The LLVM global has the type of its initializer, - // which may not be equal to the enum's type for - // non-C-like enums. - PointerCast(bcx, base::get_item_val(ccx, did.node), - T_ptr(type_of(bcx.ccx(), const_ty))) - } else { - base::trans_external_path(ccx, did, const_ty) - } - } - - #[cfg(stage1)] - #[cfg(stage2)] - #[cfg(stage3)] fn get_val(bcx: block, did: ast::def_id, const_ty: ty::t) -> ValueRef { // The LLVM global has the type of its initializer, diff --git a/src/libstd/comm.rs b/src/libstd/comm.rs index 23ae7666bb4..314a601fb61 100644 --- a/src/libstd/comm.rs +++ b/src/libstd/comm.rs @@ -26,9 +26,6 @@ pub struct DuplexStream { } // Allow these methods to be used without import: -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] pub impl DuplexStream { fn send(&self, x: T) { self.chan.send(x) diff --git a/src/snapshots.txt b/src/snapshots.txt index 31acfa81100..7116e32b283 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,11 @@ +S 2013-03-21 ed25a67 + freebsd-x86_64 5f0b08839ae3d1207808f0d57cbfdb00eff9c883 + linux-i386 54765a17c6b6d04a7013cada2a51d190462979b8 + linux-x86_64 c6cae795aecb8c4d5f17c73bfdd01d2b0ff32126 + macos-i386 bc05e17fc93187a1906f118ecdb258f09317f220 + macos-x86_64 c39838814f45e343d4f5754390aad22c41a34ba6 + winnt-i386 c4a858ef45ab2c9319e607640b2bbb3bc4b48093 + S 2013-02-27 a6d9689 freebsd-x86_64 683f329fe589af854f9a375405468691d98015ac linux-i386 22f5c2a91941735007ed804586fc0f0e82fc3601