about summary refs log tree commit diff
path: root/src/libstd/task
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2013-07-29 12:04:31 -0700
committerBrian Anderson <banderson@mozilla.com>2013-07-30 14:23:46 -0700
commit08480e4fda203fe3c0392563d4a13312958648dc (patch)
treedda09e263ebb56c98dd48fbb13447c9f821c22f2 /src/libstd/task
parent5d2b8d43729f3c616f0af0125f05e2cab9d0aae4 (diff)
downloadrust-08480e4fda203fe3c0392563d4a13312958648dc.tar.gz
rust-08480e4fda203fe3c0392563d4a13312958648dc.zip
std: Remove ExistingScheduler spawn mode. Unused
Diffstat (limited to 'src/libstd/task')
-rw-r--r--src/libstd/task/mod.rs14
-rw-r--r--src/libstd/task/spawn.rs5
2 files changed, 2 insertions, 17 deletions
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs
index c14926ba5a4..d9e119e2d2c 100644
--- a/src/libstd/task/mod.rs
+++ b/src/libstd/task/mod.rs
@@ -44,7 +44,7 @@ use result::Result;
 use result;
 use rt::{context, OldTaskContext, TaskContext};
 use rt::local::Local;
-use task::rt::{task_id, sched_id};
+use task::rt::task_id;
 use unstable::finally::Finally;
 use util;
 
@@ -58,12 +58,6 @@ mod local_data_priv;
 pub mod rt;
 pub mod spawn;
 
-/// A handle to a scheduler
-#[deriving(Eq)]
-pub enum Scheduler {
-    SchedulerHandle(sched_id)
-}
-
 /// A handle to a task
 #[deriving(Eq)]
 pub enum Task {
@@ -94,8 +88,6 @@ pub enum SchedMode {
     DefaultScheduler,
     /// Run task on the current scheduler
     CurrentScheduler,
-    /// Run task on a specific scheduler
-    ExistingScheduler(Scheduler),
     /// All tasks run in the same OS thread
     SingleThreaded,
 }
@@ -588,10 +580,6 @@ pub fn get_task() -> Task {
     }
 }
 
-pub fn get_scheduler() -> Scheduler {
-    SchedulerHandle(unsafe { rt::rust_get_sched_id() })
-}
-
 /**
  * Temporarily make the task unkillable
  *
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs
index 1e4d781c5d2..58b442b7953 100644
--- a/src/libstd/task/spawn.rs
+++ b/src/libstd/task/spawn.rs
@@ -86,7 +86,6 @@ use task::rt::rust_task;
 use task::rt;
 use task::{Failure, SchedOpts, SingleThreaded};
 use task::{Success, TaskOpts, TaskResult};
-use task::{ExistingScheduler, SchedulerHandle};
 use task::unkillable;
 use to_bytes::IterBytes;
 use uint;
@@ -807,15 +806,13 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
 
         let num_threads = match opts.mode {
             DefaultScheduler
-            | CurrentScheduler
-            | ExistingScheduler(*) => 0u, /* Won't be used */
+            | CurrentScheduler => 0u, /* Won't be used */
             SingleThreaded => 1u,
         };
 
         unsafe {
             let sched_id = match opts.mode {
                 CurrentScheduler => rt::rust_get_sched_id(),
-                ExistingScheduler(SchedulerHandle(id)) => id,
                 _ => rt::rust_new_sched(num_threads)
             };
             rt::rust_new_task_in_sched(sched_id)