---

yaml
---
r: 6399
b: refs/heads/master
c: 3cfcdb4
h: refs/heads/master
i:
  6397: 5460767
  6395: ba72ae9
  6391: 2c2b3a6
  6383: f3d7655
  6367: e993b89
  6335: 091bb5e
  6271: ea279e1
  6143: efd3c6b
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57b43b53f9c673545b25338eefa7f3c620d85aa4
+refs/heads/master: 3cfcdb4bb279bab6f58b147486f5e2a54411b316

trunk/src/rt/rust_task.cpp

@@ -213,8 +213,8 @@ void task_start_wrapper(spawn_args *a)
     } else {
         task->lock.lock();
         task->lock.unlock();
-        task->yield(1);
     }
+    task->ctx.next->swap(task->ctx);
 }
 
 void
@@ -274,7 +274,7 @@ rust_task::yield(size_t time_in_us) {
     LOG(this, task, "task %s @0x%" PRIxPTR " yielding for %d us",
         name, this, time_in_us);
 
-    if (killed && !dead()) {
+    if (killed) {
         // Receive may have blocked before yielding
         unblock();
         fail();
@@ -333,7 +333,6 @@ void
 rust_task::conclude_failure() {
     fail_parent();
     failed = true;
-    yield(4);
 }
 
 void