---

yaml
---
r: 20898
b: refs/heads/snap-stage3
c: 7437004
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c973732a23da75b09dd6d35ce6f951c8bcd6cb01
+refs/heads/snap-stage3: 74370042aa698c0360aadf356ccc4305cc2c0cd2
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/task.rs

@@ -71,7 +71,7 @@ export single_threaded;
 export thread_per_core;
 export thread_per_task;
 export manual_threads;
-export osmain;
+export platform_thread;
 
 /* Data types */
 
@@ -116,7 +116,7 @@ enum sched_mode {
      * The main OS thread is the thread used to launch the runtime which,
      * in most cases, is the process's initial thread as created by the OS.
      */
-    osmain
+    platform_thread
 }
 
 /**
@@ -1176,10 +1176,10 @@ fn spawn_raw(opts: task_opts, +f: fn~()) {
             }
             threads
           }
-          osmain => 0u /* Won't be used */
+          platform_thread => 0u /* Won't be used */
         };
 
-        let sched_id = if opts.mode != osmain {
+        let sched_id = if opts.mode != platform_thread {
             rustrt::rust_new_sched(num_threads)
         } else {
             rustrt::rust_osmain_sched_id()
@@ -1899,10 +1899,10 @@ fn test_avoid_copying_the_body_unlinked() {
 }
 
 #[test]
-fn test_osmain() {
+fn test_platform_thread() {
     let po = comm::port();
     let ch = comm::chan(po);
-    do task().sched_mode(osmain).spawn {
+    do task().sched_mode(platform_thread).spawn {
         comm::send(ch, ());
     }
     comm::recv(po);

branches/snap-stage3/src/test/run-pass/osmain.rs renamed to branches/snap-stage3/src/test/run-pass/platform_thread.rs

@@ -14,7 +14,7 @@ fn run(i: int) {
         return;
     }
 
-    do task::task().sched_mode(task::osmain).unlinked().spawn {
+    do task::task().sched_mode(task::platform_thread).unlinked().spawn {
         task::yield();
         do task::task().sched_mode(task::single_threaded).unlinked().spawn {
             task::yield();