summary refs log tree commit diff
path: root/src/libstd/thread/local.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-06-10 19:33:04 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-06-17 09:07:17 -0700
commitb4a2823cd6c6f1a560469587f902f3a1f49d3c79 (patch)
tree162e8021fd73ffc7dfe0798dc99097138343977a /src/libstd/thread/local.rs
parentaa931e9c6f92557b99978f1cc562c99051190f79 (diff)
downloadrust-b4a2823cd6c6f1a560469587f902f3a1f49d3c79.tar.gz
rust-b4a2823cd6c6f1a560469587f902f3a1f49d3c79.zip
More test fixes and fallout of stability changes
Diffstat (limited to 'src/libstd/thread/local.rs')
-rw-r--r--src/libstd/thread/local.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs
index 2b5e3fb18eb..2c4b716cc6e 100644
--- a/src/libstd/thread/local.rs
+++ b/src/libstd/thread/local.rs
@@ -326,7 +326,6 @@ 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 ptr;
         use libc;
@@ -360,7 +359,7 @@ mod imp {
         type List = Vec<(*mut u8, unsafe extern fn(*mut u8))>;
         if DTORS.get().is_null() {
             let v: Box<List> = box Vec::new();
-            DTORS.set(boxed::into_raw(v) as *mut u8);
+            DTORS.set(Box::into_raw(v) as *mut u8);
         }
         let list: &mut List = &mut *(DTORS.get() as *mut List);
         list.push((t, dtor));