diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-23 11:52:31 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-23 12:46:11 -0800 |
| commit | ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043 (patch) | |
| tree | 1c2a90b8e1aac6793a0fbf6350778a5b9ac65dae /src/libstd/thread_local | |
| parent | 1beaebbaa69be535d00592e2ac37af4dcba427d9 (diff) | |
| download | rust-ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043.tar.gz rust-ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/thread_local')
| -rw-r--r-- | src/libstd/thread_local/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index 9549ae14b88..cdd71d440fe 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -330,7 +330,6 @@ impl<T: 'static> Key<T> { mod imp { use prelude::v1::*; - use alloc::boxed; use cell::UnsafeCell; use intrinsics; use ptr; @@ -389,6 +388,7 @@ mod imp { // Due to rust-lang/rust#18804, make sure this is not generic! #[cfg(target_os = "linux")] unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { + use boxed; use mem; use libc; use sys_common::thread_local as os; |