---

yaml
---
r: 6201
b: refs/heads/master
c: 68f82de
h: refs/heads/master
i:
  6199: df70b3f
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f8b69534435d8dc459e5731d8fb41b22725b37f
+refs/heads/master: 68f82de8178ca5f7ed7a3803fdc41f84fc97664b

trunk/src/lib/task.rs

@@ -53,7 +53,6 @@ export spawn_joinable;
 native "cdecl" mod rustrt {
     // these must run on the Rust stack so that they can swap stacks etc:
     fn task_sleep(time_in_us: uint);
-    fn task_yield();
 }
 
 native "c-stack-cdecl" mod rustrt2 = "rustrt" {
@@ -149,7 +148,7 @@ Yield control to the task scheduler
 
 The scheduler may schedule another task to execute.
 */
-fn yield() { ret rustrt::task_yield(); }
+fn yield() { sleep(1u) }
 
 /*
 Function: join

trunk/src/rt/rust_builtin.cpp

@@ -171,12 +171,6 @@ task_sleep(size_t time_in_us) {
     task->yield(time_in_us);
 }
 
-extern "C" CDECL void
-task_yield() {
-    rust_task *task = rust_scheduler::get_task();
-    task->yield(1);
-}
-
 /* Debug builtins for std::dbg. */
 
 static void

trunk/src/rt/rustrt.def.in

@@ -60,7 +60,6 @@ start_task
 vec_reserve_shared
 vec_from_buf_shared
 task_sleep
-task_yield
 unsupervise
 upcall_alloc_c_stack
 upcall_call_c_stack

trunk/src/test/run-pass/bind-native.rs

@@ -3,7 +3,7 @@ Can we bind native things?
 */
 
 native "c-stack-cdecl" mod rustrt {
-    fn task_yield();
+    fn task_sleep();
 }
 
-fn main() { bind rustrt::task_yield(); }
+fn main() { bind rustrt::task_sleep(); }