diff options
| author | bors <bors@rust-lang.org> | 2013-02-28 22:45:37 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-02-28 22:45:37 -0800 |
| commit | a660bb362ce5a39014fb274367e6361d4deb8a7d (patch) | |
| tree | a697e39ba2c9b48184982e03af6f0d1c69dfdb98 /src/libcore | |
| parent | b7e72974dc09b050b07f7acb30dd70b0a65f4110 (diff) | |
| parent | d66a3dd0ec5982f964e540c758276d59af178960 (diff) | |
| download | rust-a660bb362ce5a39014fb274367e6361d4deb8a7d.tar.gz rust-a660bb362ce5a39014fb274367e6361d4deb8a7d.zip | |
auto merge of #5180 : catamorphism/rust/post-snapshot, r=catamorphism
* Disallow structural records everywhere * Remove all #[cfg(stage0)] stuff * Remove the last deprecated modes in libcore * Un-xfail a test
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/comm.rs | 3 | ||||
| -rw-r--r-- | src/libcore/core.rc | 4 | ||||
| -rw-r--r-- | src/libcore/pipes.rs | 2 | ||||
| -rw-r--r-- | src/libcore/private/finally.rs | 23 | ||||
| -rw-r--r-- | src/libcore/stackwalk.rs | 3 |
5 files changed, 0 insertions, 35 deletions
diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs index da69cd984cd..b0825816626 100644 --- a/src/libcore/comm.rs +++ b/src/libcore/comm.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// Transitional -- needs snapshot -#[allow(structural_records)]; - use either::{Either, Left, Right}; use kinds::Owned; use option; diff --git a/src/libcore/core.rc b/src/libcore/core.rc index ed18388f578..91eb61e342e 100644 --- a/src/libcore/core.rc +++ b/src/libcore/core.rc @@ -227,10 +227,6 @@ pub const debug : u32 = 4_u32; // The runtime interface used by the compiler #[cfg(notest)] pub mod rt; -// The runtime and compiler interface to fmt! -#[cfg(stage0)] -#[path = "private/extfmt.rs"] -pub mod extfmt; // Private APIs pub mod private; diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs index 6389ec08615..77554656913 100644 --- a/src/libcore/pipes.rs +++ b/src/libcore/pipes.rs @@ -82,8 +82,6 @@ bounded and unbounded protocols allows for less code duplication. */ -#[allow(structural_records)]; // Macros -- needs another snapshot - use cmp::Eq; use cast::{forget, reinterpret_cast, transmute}; use cell::Cell; diff --git a/src/libcore/private/finally.rs b/src/libcore/private/finally.rs index af7197159ca..ff75963511c 100644 --- a/src/libcore/private/finally.rs +++ b/src/libcore/private/finally.rs @@ -26,33 +26,10 @@ do || { use ops::Drop; use task::{spawn, failing}; -#[cfg(stage0)] -pub trait Finally<T> { - fn finally(&self, +dtor: &fn()) -> T; -} - -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] pub trait Finally<T> { fn finally(&self, dtor: &fn()) -> T; } -#[cfg(stage0)] -impl<T> Finally<T> for &fn() -> T { - // FIXME #4518: Should not require a mode here - fn finally(&self, +dtor: &fn()) -> T { - let _d = Finallyalizer { - dtor: dtor - }; - - (*self)() - } -} - -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] impl<T> Finally<T> for &fn() -> T { fn finally(&self, dtor: &fn()) -> T { let _d = Finallyalizer { diff --git a/src/libcore/stackwalk.rs b/src/libcore/stackwalk.rs index 2e24df86c78..8950a1d0c02 100644 --- a/src/libcore/stackwalk.rs +++ b/src/libcore/stackwalk.rs @@ -10,9 +10,6 @@ #[doc(hidden)]; // FIXME #3538 -#[legacy_modes]; // tjc: remove after snapshot -#[allow(deprecated_mode)]; - use cast::reinterpret_cast; use ptr::offset; use sys::size_of; |
