Skip to content

Commit 0c4f003

Browse files
committed
---
yaml --- r: 64887 b: refs/heads/snap-stage3 c: 33df9fc h: refs/heads/master i: 64885: 99f7f76 64883: b353f46 64879: b0ab78a v: v3
1 parent ba39486 commit 0c4f003

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
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: 8f835d42d7f7090ab6408a9aa6316a0f8f21f3f3
4+
refs/heads/snap-stage3: 33df9fc1d04c224a0c7ecb8d91b75feed75b412c
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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,9 @@ pub enum SchedMode {
9090
*
9191
* * sched_mode - The operating mode of the scheduler
9292
*
93-
* * foreign_stack_size - The size of the foreign stack, in bytes
94-
*
95-
* Rust code runs on Rust-specific stacks. When Rust code calls foreign
96-
* code (via functions in foreign modules) it switches to a typical, large
97-
* stack appropriate for running code written in languages like C. By
98-
* default these foreign stacks have unspecified size, but with this
99-
* option their size can be precisely specified.
10093
*/
10194
pub struct SchedOpts {
10295
mode: SchedMode,
103-
foreign_stack_size: Option<uint>,
10496
}
10597

10698
/**
@@ -418,7 +410,6 @@ pub fn default_task_opts() -> TaskOpts {
418410
notify_chan: None,
419411
sched: SchedOpts {
420412
mode: DefaultScheduler,
421-
foreign_stack_size: None
422413
}
423414
}
424415
}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ use local_data;
8484
use task::local_data_priv::{local_get, local_set, OldHandle};
8585
use task::rt::rust_task;
8686
use task::rt;
87-
use task::{Failure, SchedOpts};
87+
use task::{Failure};
8888
use task::{Success, TaskOpts, TaskResult};
8989
use task::unkillable;
9090
use to_bytes::IterBytes;
@@ -741,7 +741,7 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
741741
// Create child task.
742742
let new_task = match opts.sched.mode {
743743
DefaultScheduler => rt::new_task(),
744-
_ => new_task_in_sched(opts.sched)
744+
_ => new_task_in_sched()
745745
};
746746
assert!(!new_task.is_null());
747747
// Getting killed after here would leak the task.
@@ -799,11 +799,7 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
799799
return result;
800800
}
801801

802-
fn new_task_in_sched(opts: SchedOpts) -> *rust_task {
803-
if opts.foreign_stack_size != None {
804-
fail!("foreign_stack_size scheduler option unimplemented");
805-
}
806-
802+
fn new_task_in_sched() -> *rust_task {
807803
unsafe {
808804
let sched_id = rt::rust_new_sched(1);
809805
rt::rust_new_task_in_sched(sched_id)

0 commit comments

Comments
 (0)