about summary refs log tree commit diff
path: root/src/rt/rust_task.cpp
diff options
context:
space:
mode:
authorJames Miller <james@aatch.net>2013-06-20 17:15:50 +1200
committerJames Miller <bladeon@gmail.com>2013-06-21 02:43:02 +1200
commit3bc4d1a1206ad5f4bb31475e17fc18ecf855ed8e (patch)
tree3cec5e46a4f4a7b7b689f75b56e18ebc3f966bb4 /src/rt/rust_task.cpp
parent6759ce4fd2083595193c93c3fd72383d24a73a5e (diff)
downloadrust-3bc4d1a1206ad5f4bb31475e17fc18ecf855ed8e.tar.gz
rust-3bc4d1a1206ad5f4bb31475e17fc18ecf855ed8e.zip
Remove all #[cfg(stage0)]-protected code
New snapshot means this can all go. Also removes places that have
comments that say they are workarounds for stage0 errors.
Diffstat (limited to 'src/rt/rust_task.cpp')
-rw-r--r--src/rt/rust_task.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index f9b588b7850..fe1b4622137 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -162,11 +162,7 @@ void task_start_wrapper(spawn_args *a)
 
     bool threw_exception = false;
     try {
-#ifdef _RUST_STAGE0
-        a->f(NULL, a->envptr, a->argptr);
-#else
         a->f(a->envptr, a->argptr);
-#endif
     } catch (rust_task *ex) {
         assert(ex == task && "Expected this task to be thrown for unwinding");
         threw_exception = true;
@@ -187,11 +183,7 @@ void task_start_wrapper(spawn_args *a)
     if(env) {
         // free the environment (which should be a unique closure).
         const type_desc *td = env->td;
-#ifdef _RUST_STAGE0
-        td->drop_glue(NULL, NULL, NULL, box_body(env));
-#else
         td->drop_glue(NULL, NULL, box_body(env));
-#endif
         task->kernel->region()->free(env);
     }