diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-31 10:20:31 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-31 10:20:31 -0800 |
| commit | aec67c2ee0f673ea7b0e21c2fe7e0f26a523d823 (patch) | |
| tree | 032a8ec1398c7334c20b791a4c4c460feb5e2c79 /src/libstd/thread.rs | |
| parent | 582cba183f18eea5c40b6c035d63ad449a9e8604 (diff) | |
| download | rust-aec67c2ee0f673ea7b0e21c2fe7e0f26a523d823.tar.gz rust-aec67c2ee0f673ea7b0e21c2fe7e0f26a523d823.zip | |
Revert "std: Re-enable at_exit()"
This reverts commit 9e224c2bf18ebf8f871efb2e1aba43ed7970ebb7. Conflicts: src/libstd/sys/windows/os.rs
Diffstat (limited to 'src/libstd/thread.rs')
| -rw-r--r-- | src/libstd/thread.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index cfdb5c2ec26..a7b3ee996a3 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -232,10 +232,13 @@ impl Builder { let my_stack_top = addr as uint; let my_stack_bottom = my_stack_top - stack_size + 1024; unsafe { - stack::record_os_managed_stack_bounds(my_stack_bottom, - my_stack_top); - thread_info::set(imp::guard::current(), their_thread); + stack::record_os_managed_stack_bounds(my_stack_bottom, my_stack_top); } + thread_info::set( + (my_stack_bottom, my_stack_top), + unsafe { imp::guard::current() }, + their_thread + ); let mut output = None; let f: Thunk<(), T> = if stdout.is_some() || stderr.is_some() { |