diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-06-15 17:00:36 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-06-15 17:00:36 -0700 |
| commit | b08c4467980bc712995d421dd50c1cca2948b67b (patch) | |
| tree | 7ab9a238f0461ec8edbea5fe4cfa5d792ae57d82 /src/libstd/task | |
| parent | e7213aa21e9a79db01d2e9d1b76761a420e4c967 (diff) | |
| parent | d1ec8b5fb85cb6fd4caed64223c5cb3fd920daab (diff) | |
| download | rust-b08c4467980bc712995d421dd50c1cca2948b67b.tar.gz rust-b08c4467980bc712995d421dd50c1cca2948b67b.zip | |
Merge remote-tracking branch 'toddaaro/io' into io
Diffstat (limited to 'src/libstd/task')
| -rw-r--r-- | src/libstd/task/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/task/spawn.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs index f24d2327358..df5b88207ec 100644 --- a/src/libstd/task/mod.rs +++ b/src/libstd/task/mod.rs @@ -514,7 +514,7 @@ pub fn failing() -> bool { } _ => { let mut unwinding = false; - do Local::borrow::<Task> |local| { + do Local::borrow::<Task, ()> |local| { unwinding = match local.unwinder { Some(unwinder) => { unwinder.unwinding diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index 5941221821a..5e507238f67 100644 --- a/src/libstd/task/spawn.rs +++ b/src/libstd/task/spawn.rs @@ -578,7 +578,7 @@ fn spawn_raw_newsched(_opts: TaskOpts, f: ~fn()) { let mut sched = Local::take::<Scheduler>(); let task = ~Coroutine::new(&mut sched.stack_pool, f); - sched.schedule_new_task(task); + sched.schedule_task(task); } fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) { |