Skip to content

Commit 1cd6d3c

Browse files
committed
---
yaml --- r: 64876 b: refs/heads/snap-stage3 c: 85fd75a h: refs/heads/master v: v3
1 parent 76e173c commit 1cd6d3c

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: cb9ee7f5be0de2bb93688f8e2ef2934eb3bd7df7
4+
refs/heads/snap-stage3: 85fd75ac47a2a70ac9ccdddbe2d1de6425e99be8
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/task/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ pub enum SchedMode {
105105
PlatformThread,
106106
/// All tasks run in the same OS thread
107107
SingleThreaded,
108-
/// Tasks are distributed among available CPUs
109-
ThreadPerTask,
110108
}
111109

112110
/**

branches/snap-stage3/src/libstd/task/spawn.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ use task::local_data_priv::{local_get, local_set, OldHandle};
8585
use task::rt::rust_task;
8686
use task::rt;
8787
use task::{Failure, PlatformThread, SchedOpts, SingleThreaded};
88-
use task::{Success, TaskOpts, TaskResult, ThreadPerTask};
88+
use task::{Success, TaskOpts, TaskResult};
8989
use task::{ExistingScheduler, SchedulerHandle};
9090
use task::unkillable;
9191
use to_bytes::IterBytes;
@@ -811,9 +811,6 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
811811
| ExistingScheduler(*)
812812
| PlatformThread => 0u, /* Won't be used */
813813
SingleThreaded => 1u,
814-
ThreadPerTask => {
815-
fail!("ThreadPerTask scheduling mode unimplemented")
816-
}
817814
};
818815

819816
unsafe {

0 commit comments

Comments
 (0)