Skip to content

Commit 81dda9d

Browse files
committed
std: Remove CurrentScheduler spawn mode. Unused
1 parent 08480e4 commit 81dda9d

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

src/libstd/task/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ pub enum TaskResult {
8686
pub enum SchedMode {
8787
/// Run task on the default scheduler
8888
DefaultScheduler,
89-
/// Run task on the current scheduler
90-
CurrentScheduler,
9189
/// All tasks run in the same OS thread
9290
SingleThreaded,
9391
}

src/libstd/task/spawn.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ use local_data;
8484
use task::local_data_priv::{local_get, local_set, OldHandle};
8585
use task::rt::rust_task;
8686
use task::rt;
87-
use task::{Failure, SchedOpts, SingleThreaded};
87+
use task::{Failure, SchedOpts};
8888
use task::{Success, TaskOpts, TaskResult};
8989
use task::unkillable;
9090
use to_bytes::IterBytes;
@@ -804,17 +804,8 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
804804
fail!("foreign_stack_size scheduler option unimplemented");
805805
}
806806

807-
let num_threads = match opts.mode {
808-
DefaultScheduler
809-
| CurrentScheduler => 0u, /* Won't be used */
810-
SingleThreaded => 1u,
811-
};
812-
813807
unsafe {
814-
let sched_id = match opts.mode {
815-
CurrentScheduler => rt::rust_get_sched_id(),
816-
_ => rt::rust_new_sched(num_threads)
817-
};
808+
let sched_id = rt::rust_new_sched(1);
818809
rt::rust_new_task_in_sched(sched_id)
819810
}
820811
}

0 commit comments

Comments
 (0)