---

yaml
---
r: 21837
b: refs/heads/snap-stage3
c: 24c8969
h: refs/heads/master
i:
  21835: d6797ee
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ce773352d06f490fb1bfb5057035e93effcf5781
+refs/heads/snap-stage3: 24c89693f0556ba4b455df358a9136f7873776bf
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/cleanup.rs

@@ -1,7 +1,6 @@
 use libc::{c_char, c_void, intptr_t, uintptr_t};
 use ptr::{mut_null, null, to_unsafe_ptr};
 use repr::BoxRepr;
-use rt::rt_free;
 use sys::TypeDesc;
 use unsafe::transmute;
 
@@ -67,7 +66,12 @@ struct Task {
  * This runs at task death to free all boxes.
  */
 
-unsafe fn do_annihilate() {
+/// Destroys all managed memory (i.e. @ boxes) held by the current task.
+#[cfg(notest)]
+#[lang="annihilate"]
+pub unsafe fn annihilate() {
+    use rt::rt_free;
+
     let task: *Task = transmute(rustrt::rust_get_task());
 
     // Pass 1: Make all boxes immortal.
@@ -105,61 +109,9 @@ unsafe fn do_annihilate() {
     }
 }
 
-/// Destroys all managed memory (i.e. @ boxes) held by the current task.
-#[cfg(notest)]
-#[lang="annihilate"]
-pub unsafe fn annihilate() {
-    do_annihilate();
-}
-
-#[cfg(test)]
-pub unsafe fn annihilate() {
-    do_annihilate();
-}
-
 /// Bindings to the runtime
 extern mod rustrt {
     #[rust_stack]
     /*priv*/ fn rust_get_task() -> *c_void;
 }
 
-/*
- * Tests
- */
-
-#[cfg(test)]
-mod tests {
-    struct Knot {
-        mut a: Option<@Knot>
-    }
-
-    struct Blah {
-        x: int,
-        drop { io::println("Blah!"); }
-    }
-
-    #[test]
-    fn test_box_annihilation() {
-        let knot = @Knot { a: None };
-        knot.a = Some(knot);
-
-        let x = @~"foo";
-
-        let blah = @Blah { x: 3 };
-
-        let f_ref = @mut None;
-        let f = || { util::ignore(f_ref); };
-        *f_ref = Some(f);
-
-        unsafe { annihilate(); }
-
-        unsafe {
-            unsafe::forget(knot);
-            unsafe::forget(x);
-            unsafe::forget(blah);
-            unsafe::forget(f_ref);
-            unsafe::forget(f);
-        }
-    }
-}
-