---

yaml
---
r: 64877
b: refs/heads/snap-stage3
c: 5d2b8d4
h: refs/heads/master
i:
  64875: 76e173c
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 85fd75ac47a2a70ac9ccdddbe2d1de6425e99be8
+refs/heads/snap-stage3: 5d2b8d43729f3c616f0af0125f05e2cab9d0aae4
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/task/mod.rs

@@ -96,13 +96,6 @@ pub enum SchedMode {
     CurrentScheduler,
     /// Run task on a specific scheduler
     ExistingScheduler(Scheduler),
-    /**
-     * Tasks are scheduled on the main OS thread
-     *
-     * 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.
-     */
-    PlatformThread,
     /// All tasks run in the same OS thread
     SingleThreaded,
 }
@@ -1094,17 +1087,6 @@ fn test_avoid_copying_the_body_unlinked() {
     }
 }
 
-#[test]
-fn test_platform_thread() {
-    let (po, ch) = stream();
-    let mut builder = task();
-    builder.sched_mode(PlatformThread);
-    do builder.spawn {
-        ch.send(());
-    }
-    po.recv();
-}
-
 #[test]
 #[ignore(cfg(windows))]
 #[should_fail]

branches/snap-stage3/src/libstd/task/spawn.rs

@@ -84,7 +84,7 @@ use local_data;
 use task::local_data_priv::{local_get, local_set, OldHandle};
 use task::rt::rust_task;
 use task::rt;
-use task::{Failure, PlatformThread, SchedOpts, SingleThreaded};
+use task::{Failure, SchedOpts, SingleThreaded};
 use task::{Success, TaskOpts, TaskResult};
 use task::{ExistingScheduler, SchedulerHandle};
 use task::unkillable;
@@ -808,16 +808,14 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
         let num_threads = match opts.mode {
             DefaultScheduler
             | CurrentScheduler
-            | ExistingScheduler(*)
-            | PlatformThread => 0u, /* Won't be used */
+            | ExistingScheduler(*) => 0u, /* Won't be used */
             SingleThreaded => 1u,
         };
 
         unsafe {
             let sched_id = match opts.mode {
                 CurrentScheduler => rt::rust_get_sched_id(),
                 ExistingScheduler(SchedulerHandle(id)) => id,
-                PlatformThread => rt::rust_osmain_sched_id(),
                 _ => rt::rust_new_sched(num_threads)
             };
             rt::rust_new_task_in_sched(sched_id)