---

yaml
---
r: 64879
b: refs/heads/snap-stage3
c: 81dda9d
h: refs/heads/master
i:
  64877: 65bebdb
  64875: 76e173c
  64871: 3ddcb61
  64863: 1670e3c
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 08480e4fda203fe3c0392563d4a13312958648dc
+refs/heads/snap-stage3: 81dda9d9cb5a8e472509c6f335acc81083d74b91
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -86,8 +86,6 @@ pub enum TaskResult {
 pub enum SchedMode {
     /// Run task on the default scheduler
     DefaultScheduler,
-    /// Run task on the current scheduler
-    CurrentScheduler,
     /// All tasks run in the same OS thread
     SingleThreaded,
 }

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, SchedOpts, SingleThreaded};
+use task::{Failure, SchedOpts};
 use task::{Success, TaskOpts, TaskResult};
 use task::unkillable;
 use to_bytes::IterBytes;
@@ -804,17 +804,8 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
             fail!("foreign_stack_size scheduler option unimplemented");
         }
 
-        let num_threads = match opts.mode {
-            DefaultScheduler
-            | CurrentScheduler => 0u, /* Won't be used */
-            SingleThreaded => 1u,
-        };
-
         unsafe {
-            let sched_id = match opts.mode {
-                CurrentScheduler => rt::rust_get_sched_id(),
-                _ => rt::rust_new_sched(num_threads)
-            };
+            let sched_id = rt::rust_new_sched(1);
             rt::rust_new_task_in_sched(sched_id)
         }
     }