diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs index d9e119e2d2c..7dec63aef58 100644 --- a/src/libstd/task/mod.rs +++ b/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, } diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index 58b442b7953..1d183e7dabb 100644 --- a/src/libstd/task/spawn.rs +++ b/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) } }