user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rollup merge of #20354: alexcrichton/second-pass-thread_local

Browse source 
Conflicts:
	src/libstd/sys/common/thread_info.rs
This commit is contained in:
Alex Crichton 2015-01-02 09:19:45 -08:00
commit 4b0e084aa1
3 changed files with 145 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libstd/sys/common/thread_info.rs
View file

@ -10,9 +10,10 @@
use core::prelude::*;
use thread::Thread;
use cell::RefCell;
use string::String;
use thread::Thread;
use thread_local::State;
struct ThreadInfo {
// This field holds the known bounds of the stack in (lo, hi)
@ -27,7 +28,7 @@ thread_local! { static THREAD_INFO: RefCell<Option<ThreadInfo>> = RefCell::new(N
impl ThreadInfo {
fn with<R, F>(f: F) -> R where F: FnOnce(&mut ThreadInfo) -> R {
if THREAD_INFO.destroyed() {
if THREAD_INFO.state() == State::Destroyed {
panic!("Use of std::thread::Thread::current() is not possible after \
the thread's local data has been destroyed");
}