---

yaml
---
r: 69503
b: refs/heads/auto
c: 85fd75a
h: refs/heads/master
i:
  69501: 35bf99c
  69499: be9cc99
  69495: 2e88115
  69487: 230bb65
  69471: 5a06ad0
  69439: f71b4aa
  69375: bfa0206
v: v3

Author: brson

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: cb9ee7f5be0de2bb93688f8e2ef2934eb3bd7df7
+refs/heads/auto: 85fd75ac47a2a70ac9ccdddbe2d1de6425e99be8
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libstd/task/mod.rs

@@ -105,8 +105,6 @@ pub enum SchedMode {
     PlatformThread,
     /// All tasks run in the same OS thread
     SingleThreaded,
-    /// Tasks are distributed among available CPUs
-    ThreadPerTask,
 }
 
 /**

branches/auto/src/libstd/task/spawn.rs

@@ -85,7 +85,7 @@ 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::{Success, TaskOpts, TaskResult, ThreadPerTask};
+use task::{Success, TaskOpts, TaskResult};
 use task::{ExistingScheduler, SchedulerHandle};
 use task::unkillable;
 use to_bytes::IterBytes;
@@ -811,9 +811,6 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
             | ExistingScheduler(*)
             | PlatformThread => 0u, /* Won't be used */
             SingleThreaded => 1u,
-            ThreadPerTask => {
-                fail!("ThreadPerTask scheduling mode unimplemented")
-            }
         };
 
         unsafe {