From ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 23 Feb 2015 11:52:31 -0800
Subject: Test fixes and rebase conflicts

---
 src/libstd/thread_local/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstd/thread_local')

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;
-- 
cgit 1.4.1-3-g733a5