---

yaml
---
r: 3934
b: refs/heads/master
c: 4738cf8
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 827e3004851ff28f4394bf62d4a9fe29728ebe70
+refs/heads/master: 4738cf83b05dc02d1f7a364a6e901a1b5a18da20

trunk/src/rt/rust_scheduler.cpp

@@ -72,6 +72,7 @@ rust_scheduler::fail() {
         name, this);
     I(this, rval == 0);
     rval = 1;
+    exit(1);
 }
 
 size_t

trunk/src/rt/rust_task.cpp

@@ -220,8 +220,6 @@ rust_task::fail() {
     backtrace();
     // Unblock the task so it can unwind.
     unblock();
-    if (this == sched->root_task)
-        sched->fail();
     if (supervisor) {
         DLOG(sched, task,
              "task %s @0x%" PRIxPTR
@@ -230,7 +228,8 @@ rust_task::fail() {
         supervisor->kill();
     }
     // FIXME: implement unwinding again.
-    exit(1);
+    if (this == sched->root_task)
+        sched->fail();
 }
 
 void