about summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-14 17:51:49 +0000
committerbors <bors@rust-lang.org>2014-06-14 17:51:49 +0000
commit6d8342f5e9f7093694548e761ee7df4f55243f3f (patch)
tree64606dac9c81ec4567e19f503d4d82e249dbf40a /src/libserialize
parentd64f18c490981f33f33e9c24e1ed1316e63f11fc (diff)
parentade807c6dcf6dc4454732c5e914ca06ebb429773 (diff)
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).
Diffstat (limited to 'src/libserialize')
-rw-r--r--src/libserialize/lib.rs5
-rw-r--r--src/libserialize/serialize.rs2
2 files changed, 1 insertions, 6 deletions
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index 33d20ed7bcd..ad622eace97 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -28,11 +28,6 @@ Core encoding and decoding interfaces.
 #[cfg(test)]
 extern crate test;
 
-#[cfg(stage0)]
-#[phase(syntax, link)]
-extern crate log;
-
-#[cfg(not(stage0))]
 #[phase(plugin, link)]
 extern crate log;
 
diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs
index 40092a477b3..0ed555e392f 100644
--- a/src/libserialize/serialize.rs
+++ b/src/libserialize/serialize.rs
@@ -16,7 +16,7 @@ Core encoding and decoding interfaces.
 
 use std::path;
 use std::rc::Rc;
-use std::gc::Gc;
+use std::gc::{Gc, GC};
 
 pub trait Encoder<E> {
     // Primitive types: