From 68998724c6f3ece600aa881d74c1ed1fa0410a7b Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 17 Dec 2012 16:26:44 -0800 Subject: [PATCH] Revert "Register snapshots" This reverts commit d6d12d90ff5363f59f1a1bf67f999a5d7944abb1. --- src/libcore/int-template.rs | 4 ++++ src/libcore/int-template/int.rs | 4 ++++ src/libcore/iter-trait.rs | 4 ++++ src/libcore/kinds.rs | 18 ++++++++++++++++++ src/libcore/uint-template.rs | 4 ++++ src/libcore/uint-template/u8.rs | 4 ++++ src/libcore/uint-template/uint.rs | 7 +++++++ src/libstd/priority_queue.rs | 10 ++++++++++ src/snapshots.txt | 8 -------- 9 files changed, 55 insertions(+), 8 deletions(-) diff --git a/src/libcore/int-template.rs b/src/libcore/int-template.rs index 3d9de89aa6f..c61e2126374 100644 --- a/src/libcore/int-template.rs +++ b/src/libcore/int-template.rs @@ -12,6 +12,10 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; +#[cfg(stage0)] +use T = inst::T; +#[cfg(stage1)] +#[cfg(stage2)] use T = self::inst::T; use cmp::{Eq, Ord}; diff --git a/src/libcore/int-template/int.rs b/src/libcore/int-template/int.rs index c281185c75e..98d833adea9 100644 --- a/src/libcore/int-template/int.rs +++ b/src/libcore/int-template/int.rs @@ -10,6 +10,10 @@ //! Operations and constants for `int` +#[cfg(stage0)] +pub use inst::pow; +#[cfg(stage1)] +#[cfg(stage2)] pub use self::inst::pow; mod inst { diff --git a/src/libcore/iter-trait.rs b/src/libcore/iter-trait.rs index e0bd4d5b7c8..dfb91c49b7d 100644 --- a/src/libcore/iter-trait.rs +++ b/src/libcore/iter-trait.rs @@ -17,6 +17,10 @@ use cmp::{Eq, Ord}; +#[cfg(stage0)] +use inst::{IMPL_T, EACH, SIZE_HINT}; +#[cfg(stage1)] +#[cfg(stage2)] use self::inst::{IMPL_T, EACH, SIZE_HINT}; impl IMPL_T: iter::BaseIter { diff --git a/src/libcore/kinds.rs b/src/libcore/kinds.rs index 82ba0d42ce0..c4d500bbafa 100644 --- a/src/libcore/kinds.rs +++ b/src/libcore/kinds.rs @@ -44,6 +44,15 @@ pub trait Copy { // Empty. } +#[cfg(stage0)] +#[lang="send"] +pub trait Owned { + // Empty. +} + +#[cfg(stage1)] +#[cfg(stage2)] +#[cfg(stage3)] #[lang="owned"] pub trait Owned { // Empty. @@ -54,6 +63,15 @@ pub trait Const { // Empty. } +#[cfg(stage0)] +#[lang="owned"] +pub trait Durable { + // Empty. +} + +#[cfg(stage1)] +#[cfg(stage2)] +#[cfg(stage3)] #[lang="durable"] pub trait Durable { // Empty. diff --git a/src/libcore/uint-template.rs b/src/libcore/uint-template.rs index da0c92021a4..17a2b02647e 100644 --- a/src/libcore/uint-template.rs +++ b/src/libcore/uint-template.rs @@ -12,6 +12,10 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; +#[cfg(stage0)] +use T = inst::T; +#[cfg(stage1)] +#[cfg(stage2)] use T = self::inst::T; use cmp::{Eq, Ord}; diff --git a/src/libcore/uint-template/u8.rs b/src/libcore/uint-template/u8.rs index 3c64eebf761..4d0b3f2d4b7 100644 --- a/src/libcore/uint-template/u8.rs +++ b/src/libcore/uint-template/u8.rs @@ -10,6 +10,10 @@ //! Operations and constants for `u8` +#[cfg(stage0)] +pub use inst::is_ascii; +#[cfg(stage1)] +#[cfg(stage2)] pub use self::inst::is_ascii; mod inst { diff --git a/src/libcore/uint-template/uint.rs b/src/libcore/uint-template/uint.rs index bd7f8c09f47..8451d78d8e0 100644 --- a/src/libcore/uint-template/uint.rs +++ b/src/libcore/uint-template/uint.rs @@ -10,6 +10,13 @@ //! Operations and constants for `uint` +#[cfg(stage0)] +pub use inst::{ + div_ceil, div_round, div_floor, iterate, + next_power_of_two +}; +#[cfg(stage1)] +#[cfg(stage2)] pub use self::inst::{ div_ceil, div_round, div_floor, iterate, next_power_of_two diff --git a/src/libstd/priority_queue.rs b/src/libstd/priority_queue.rs index 642b27fa465..2f24b47883f 100644 --- a/src/libstd/priority_queue.rs +++ b/src/libstd/priority_queue.rs @@ -80,10 +80,20 @@ impl PriorityQueue { } /// Consume the PriorityQueue and return the underlying vector + #[cfg(stage0)] + pure fn to_vec(self) -> ~[T] { fail } + #[cfg(stage1)] + #[cfg(stage2)] + #[cfg(stage3)] pure fn to_vec(self) -> ~[T] { let PriorityQueue{data: v} = self; v } /// Consume the PriorityQueue and return a vector in sorted /// (ascending) order + #[cfg(stage0)] + pure fn to_sorted_vec(self) -> ~[T] { fail } + #[cfg(stage1)] + #[cfg(stage2)] + #[cfg(stage3)] pure fn to_sorted_vec(self) -> ~[T] { let mut q = self; let mut end = q.len(); diff --git a/src/snapshots.txt b/src/snapshots.txt index 63428ee982c..2985cabfc26 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,11 +1,3 @@ -S 2012-12-14 dbc52ce - macos-i386 994697c57810b8f139d71df47024512970db860c - macos-x86_64 f8faa6a80b0b98b27ceee6fec71ded7ca058104d - linux-i386 238389613220fac131647a67efadc9e20f09c21a - linux-x86_64 8f27f367866d3d52300d7e5d75f602a220bef6fb - winnt-i386 92ac1ac09a262a59f40160c9dcf535e1c8ea8e75 - freebsd-x86_64 d39ff0cbd7fdf04de55baea9d4003705f5ff6441 - S 2012-12-08 6630d75 macos-i386 cdb0f0ebe99b8fea7688d9ae32860a63d1e05399 macos-x86_64 c509dc252be6e1c5cf862c659235dc94bde397aa