Skip to content

Remove code that was awaiting a snapshot #5180

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

Closed
wants to merge 2 commits into from
Closed
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
3 changes: 0 additions & 3 deletions src/libcore/comm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions src/libcore/core.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions src/libcore/pipes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
23 changes: 0 additions & 23 deletions src/libcore/private/finally.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions src/libcore/stackwalk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions src/librustc/middle/trans/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,7 @@ impl get_node_info for ast::blk {
}
}

// XXX: Work around a trait parsing bug. remove after snapshot
pub type optional_boxed_ast_expr = Option<@ast::expr>;

impl get_node_info for optional_boxed_ast_expr {
impl get_node_info for Option<@ast::expr> {
fn info(&self) -> Option<NodeInfo> {
self.chain_ref(|s| s.info())
}
Expand Down
24 changes: 0 additions & 24 deletions src/libstd/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,34 +46,10 @@ extern mod rustrt {
// colons. This way if some test runner wants to arrange the tests
// hierarchically it may.

#[cfg(stage0)]
pub enum TestName {
// Stage0 doesn't understand sendable &static/str yet
StaticTestName(&static/[u8]),
DynTestName(~str)
}

#[cfg(stage0)]
impl ToStr for TestName {
pure fn to_str(&self) -> ~str {
match self {
&StaticTestName(s) => str::from_bytes(s),
&DynTestName(s) => s.to_str()
}
}
}

#[cfg(stage1)]
#[cfg(stage2)]
#[cfg(stage3)]
pub enum TestName {
StaticTestName(&static/str),
DynTestName(~str)
}

#[cfg(stage1)]
#[cfg(stage2)]
#[cfg(stage3)]
impl ToStr for TestName {
pure fn to_str(&self) -> ~str {
match self {
Expand Down
4 changes: 1 addition & 3 deletions src/test/pretty/record-trailing-comma.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// NOTE this is a pretty-printer bug that I fixed, but it's
// not in the snapshot yet. After a new snapshot, can un-xfail
// xfail-pretty
// xfail-test
// pp-exact
struct Thing {
x: int,
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/pipe-select-macro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// tjc: un-xfail after snapshot
// xfail-test
// xfail-pretty

// Protocols
proto! foo (
Expand Down