diff options
| author | bors <bors@rust-lang.org> | 2013-07-21 22:34:36 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-21 22:34:36 -0700 |
| commit | 74f4badcab30c91b018f308d2c44641abed7d732 (patch) | |
| tree | 81dd71ea871e583375edf2dc423b17f3653b2e08 /src/libstd/task/spawn.rs | |
| parent | 3d6c0bc05640b9cc62db9fe287903cb709056dcb (diff) | |
| parent | f51e2ad435d7c0b4cb1bdebc5b6db29b65249125 (diff) | |
| download | rust-74f4badcab30c91b018f308d2c44641abed7d732.tar.gz rust-74f4badcab30c91b018f308d2c44641abed7d732.zip | |
auto merge of #7955 : thestinger/rust/snapshot, r=huonw
Diffstat (limited to 'src/libstd/task/spawn.rs')
| -rw-r--r-- | src/libstd/task/spawn.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index 2150c0c5ac2..a17bb2b1632 100644 --- a/src/libstd/task/spawn.rs +++ b/src/libstd/task/spawn.rs @@ -487,14 +487,9 @@ fn kill_taskgroup(state: TaskGroupInner, me: &TaskHandle, is_main: bool) { // FIXME (#2912): Work around core-vs-coretest function duplication. Can't use // a proper closure because the #[test]s won't understand. Have to fake it. -#[cfg(not(stage0))] fn taskgroup_key() -> local_data::Key<@@mut Taskgroup> { unsafe { cast::transmute(-2) } } -#[cfg(stage0)] -fn taskgroup_key() -> local_data::Key<@@mut Taskgroup> { - unsafe { cast::transmute((-2, 0)) } -} // Transitionary. struct RuntimeGlue; |