diff options
| author | Aaron Turon <aturon@mozilla.com> | 2014-12-01 08:49:32 -0800 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2014-12-18 23:31:51 -0800 |
| commit | d8e4780b0b59636cd979a60434a407142e407ac9 (patch) | |
| tree | 8b13d1e484c9b461ca1b5f0c80ef5ac35da1c44b /src/libstd/sys/common | |
| parent | 7fd7ce682dd6f98d456d817a297b15bdc9841190 (diff) | |
| download | rust-d8e4780b0b59636cd979a60434a407142e407ac9.tar.gz rust-d8e4780b0b59636cd979a60434a407142e407ac9.zip | |
Remove rt::{mutex, exclusive}
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/thread_local.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/sys/common/thread_local.rs b/src/libstd/sys/common/thread_local.rs index a8bc6bf9d0d..c3bf5cfc301 100644 --- a/src/libstd/sys/common/thread_local.rs +++ b/src/libstd/sys/common/thread_local.rs @@ -58,10 +58,9 @@ use prelude::*; -use rt::exclusive::Exclusive; use rt; use sync::atomic::{mod, AtomicUint}; -use sync::{Once, ONCE_INIT}; +use sync::{Mutex, Once, ONCE_INIT}; use sys::thread_local as imp; @@ -143,7 +142,7 @@ pub const INIT_INNER: StaticKeyInner = StaticKeyInner { }; static INIT_KEYS: Once = ONCE_INIT; -static mut KEYS: *mut Exclusive<Vec<imp::Key>> = 0 as *mut _; +static mut KEYS: *mut Mutex<Vec<imp::Key>> = 0 as *mut _; impl StaticKey { /// Gets the value associated with this TLS key |