auto merge of #14835 : alexcrichton/rust/no-more-at, r=brson

All functionality is now available through `Gc<T>` and `box(GC) expr`. This change also removes `GC` from the prelude (it's an experimental feature).

3 files changed, 1 insertions, 12 deletions

diff --git a/src/libstd/gc.rs b/src/libstd/gc.rs
index b57920e002c..e889752f4fc 100644
--- a/src/libstd/gc.rs
+++ b/src/libstd/gc.rs
@@ -33,9 +33,6 @@ use raw;
                   task annihilation. For now, cycles need to be broken manually by using `Rc<T>` \
                   with a non-owning `Weak<T>` pointer. A tracing garbage collector is planned."]
 pub struct Gc<T> {
-    #[cfg(stage0)]
-    ptr: @T,
-    #[cfg(not(stage0))]
     _ptr: *T,
     marker: marker::NoSend,
 }
@@ -76,9 +73,6 @@ impl<T: Ord + 'static> Ord for Gc<T> {
 impl<T: Eq + 'static> Eq for Gc<T> {}
 
 impl<T: 'static> Deref<T> for Gc<T> {
-    #[cfg(stage0)]
-    fn deref<'a>(&'a self) -> &'a T { &*self.ptr }
-    #[cfg(not(stage0))]
     fn deref<'a>(&'a self) -> &'a T { &**self }
 }
 
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 0f7b89338b6..695c61efcf0 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -119,8 +119,7 @@
 #[cfg(test)] extern crate native;
 #[cfg(test)] extern crate green;
 #[cfg(test)] extern crate debug;
-#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
-#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
+#[cfg(test)] #[phase(plugin, link)] extern crate log;
 
 extern crate alloc;
 extern crate core;
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index 6fb08b6ef75..dfe6988624e 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -92,7 +92,3 @@
 #[doc(no_inline)] pub use comm::{sync_channel, channel};
 #[doc(no_inline)] pub use comm::{SyncSender, Sender, Receiver};
 #[doc(no_inline)] pub use task::spawn;
-
-// Reexported statics
-#[cfg(not(test))]
-#[doc(no_inline)] pub use gc::GC;