diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-06-25 19:03:12 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-06-25 19:32:00 -0700 |
| commit | 5d3ca4b8439d043dc77c19424348fac670acc46f (patch) | |
| tree | 32ce48a428a42a09b93950a6d91f327a132b2214 /src/libstd/task/spawn.rs | |
| parent | c06ee9f7a7fe1ad311c9fd0eb57e00646297cdbd (diff) | |
| parent | efd1438770ae371406327304cb6ad4501db256ae (diff) | |
| download | rust-5d3ca4b8439d043dc77c19424348fac670acc46f.tar.gz rust-5d3ca4b8439d043dc77c19424348fac670acc46f.zip | |
Merge remote-tracking branch 'mozilla/master' into incoming
Conflicts: src/librustc/middle/astencode.rs src/librustc/middle/check_const.rs
Diffstat (limited to 'src/libstd/task/spawn.rs')
| -rw-r--r-- | src/libstd/task/spawn.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index 77053f39677..04c0dd79ded 100644 --- a/src/libstd/task/spawn.rs +++ b/src/libstd/task/spawn.rs @@ -111,7 +111,7 @@ fn taskset_remove(tasks: &mut TaskSet, task: *rust_task) { assert!(was_present); } pub fn taskset_each(tasks: &TaskSet, blk: &fn(v: *rust_task) -> bool) -> bool { - tasks.each(|k| blk(*k)) + tasks.iter().advance(|k| blk(*k)) } // One of these per group of linked-failure tasks. |