---

brson · brson · commit 2c028fd3da72 · 2011-11-18T10:32:27.000-08:00
yaml --- r: 6393 b: refs/heads/master c: 63d40b8 h: refs/heads/master i: 6391: 2c2b3a6 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d52888f0badf05e183368ac6ba221691e8e2a130
+refs/heads/master: 63d40b8ab661ae1921bac26e0e4c72fb0ce57586
diff --git a/trunk/src/rt/rust_task.cpp b/trunk/src/rt/rust_task.cpp
@@ -277,7 +277,6 @@ rust_task::yield(size_t time_in_us) {
 
     if (killed && !dead()) {
         unblock();
-        killed = false;
         fail();
     }
     yield_timer.reset_us(time_in_us);
@@ -286,7 +285,6 @@ rust_task::yield(size_t time_in_us) {
     ctx.next->swap(ctx);
 
     if (killed) {
-        killed = false;
         fail();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: d52888f0badf05e183368ac6ba221691e8e2a130`
	`2`	`+refs/heads/master: 63d40b8ab661ae1921bac26e0e4c72fb0ce57586`
Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,6 @@ rust_task::yield(size_t time_in_us) {`
`277`	`277`
`278`	`278`	`if (killed && !dead()) {`
`279`	`279`	`unblock();`
`280`		`- killed = false;`
`281`	`280`	`fail();`
`282`	`281`	`}`
`283`	`282`	`yield_timer.reset_us(time_in_us);`
`@@ -286,7 +285,6 @@ rust_task::yield(size_t time_in_us) {`
`286`	`285`	`ctx.next->swap(ctx);`
`287`	`286`
`288`	`287`	`if (killed) {`
`289`		`- killed = false;`
`290`	`288`	`fail();`
`291`	`289`	`}`
`292`	`290`	`}`