---

yaml
---
r: 64878
b: refs/heads/snap-stage3
c: 08480e4
h: refs/heads/master
v: v3

Author: brson

[refs]

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

branches/snap-stage3/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
  *

branches/snap-stage3/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)