diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-07-29 12:00:55 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-07-30 14:23:45 -0700 |
| commit | 5d2b8d43729f3c616f0af0125f05e2cab9d0aae4 (patch) | |
| tree | d15b0a2d4408137619a1b39b5e682bda5e048112 /src/libstd/task | |
| parent | 85fd75ac47a2a70ac9ccdddbe2d1de6425e99be8 (diff) | |
| download | rust-5d2b8d43729f3c616f0af0125f05e2cab9d0aae4.tar.gz rust-5d2b8d43729f3c616f0af0125f05e2cab9d0aae4.zip | |
std: Remove PlatformThread spawn mode. Obsolete
Diffstat (limited to 'src/libstd/task')
| -rw-r--r-- | src/libstd/task/mod.rs | 18 | ||||
| -rw-r--r-- | src/libstd/task/spawn.rs | 6 |
2 files changed, 2 insertions, 22 deletions
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs index 503085b412b..c14926ba5a4 100644 --- a/src/libstd/task/mod.rs +++ b/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, } @@ -1095,17 +1088,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] fn test_unkillable() { diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index 020d9487a17..1e4d781c5d2 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, PlatformThread, SchedOpts, SingleThreaded}; +use task::{Failure, SchedOpts, SingleThreaded}; use task::{Success, TaskOpts, TaskResult}; use task::{ExistingScheduler, SchedulerHandle}; use task::unkillable; @@ -808,8 +808,7 @@ 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, }; @@ -817,7 +816,6 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) { 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) |
