---

yaml
---
r: 30545
b: refs/heads/incoming
c: 24c8969
h: refs/heads/master
i:
  30543: 3a1505e
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: ce773352d06f490fb1bfb5057035e93effcf5781
+refs/heads/incoming: 24c89693f0556ba4b455df358a9136f7873776bf
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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);
-        }
-    }
-}
-