diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 19:00:20 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 19:42:28 -0800 |
| commit | 665ea963d3c29ef7670662707f2f2307f000efa3 (patch) | |
| tree | 9281d6d03436f1c92585c191a7a130d38e1ff9f0 /src/libstd/thread_local | |
| parent | ba8ce4c2c27643cccfbbc481a19bcf4b7747cc89 (diff) | |
| download | rust-665ea963d3c29ef7670662707f2f2307f000efa3.tar.gz rust-665ea963d3c29ef7670662707f2f2307f000efa3.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/thread_local')
| -rw-r--r-- | src/libstd/thread_local/scoped.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/thread_local/scoped.rs b/src/libstd/thread_local/scoped.rs index e4633ea0f76..01220e7bc1f 100644 --- a/src/libstd/thread_local/scoped.rs +++ b/src/libstd/thread_local/scoped.rs @@ -84,7 +84,7 @@ macro_rules! __scoped_thread_local_inner { target_os = "openbsd", target_arch = "aarch64")), thread_local)] - static $name: ::std::thread_local::spawn::Key<$t> = + static $name: ::std::thread_local::scoped::Key<$t> = __scoped_thread_local_inner!($t); ); (pub static $name:ident: $t:ty) => ( @@ -94,11 +94,11 @@ macro_rules! __scoped_thread_local_inner { target_os = "openbsd", target_arch = "aarch64")), thread_local)] - pub static $name: ::std::thread_local::spawn::Key<$t> = + pub static $name: ::std::thread_local::scoped::Key<$t> = __scoped_thread_local_inner!($t); ); ($t:ty) => ({ - use std::thread_local::spawn::Key as __Key; + use std::thread_local::scoped::Key as __Key; #[cfg(not(any(windows, target_os = "android", @@ -106,7 +106,7 @@ macro_rules! __scoped_thread_local_inner { target_os = "openbsd", target_arch = "aarch64")))] const _INIT: __Key<$t> = __Key { - inner: ::std::thread_local::spawn::__impl::KeyInner { + inner: ::std::thread_local::scoped::__impl::KeyInner { inner: ::std::cell::UnsafeCell { value: 0 as *mut _ }, } }; @@ -117,8 +117,8 @@ macro_rules! __scoped_thread_local_inner { target_os = "openbsd", target_arch = "aarch64"))] const _INIT: __Key<$t> = __Key { - inner: ::std::thread_local::spawn::__impl::KeyInner { - inner: ::std::thread_local::spawn::__impl::OS_INIT, + inner: ::std::thread_local::scoped::__impl::KeyInner { + inner: ::std::thread_local::scoped::__impl::OS_INIT, marker: ::std::marker::InvariantType, } }; |