about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-11 10:02:04 -0700
committerbors <bors@rust-lang.org>2014-06-11 10:02:04 -0700
commitf0f9095f1daa3814c9589f38b574e51d394d1bbc (patch)
tree924e24d821a8d773af3a5e596d1fc603639e5e17 /src/liballoc
parentc54ce27b392e9f16a3cc70fed415af8c274af148 (diff)
parent54c2a1e1ce7f32576f0692a1de3fe2763d13bac9 (diff)
downloadrust-f0f9095f1daa3814c9589f38b574e51d394d1bbc.tar.gz
rust-f0f9095f1daa3814c9589f38b574e51d394d1bbc.zip
auto merge of #14250 : alexcrichton/rust/gc, r=brson
This commit removes `@T` from the compiler by moving the AST to using `Gc<T>`. This also starts treating `Gc<T>` as `@T` in the same way that `Box<T>` is the same as `~T` in the compiler.

After this hits a snapshot, the `@T` syntax should be able to be removed completely.
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/rc.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index 416a6ad2d8b..db6af30bce7 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -320,8 +320,8 @@ mod tests {
     #[test]
     fn gc_inside() {
         // see issue #11532
-        use std::gc::Gc;
-        let a = Rc::new(RefCell::new(Gc::new(1)));
+        use std::gc::GC;
+        let a = Rc::new(RefCell::new(box(GC) 1));
         assert!(a.try_borrow_mut().is_some());
     }