Fix windows failure (fixup #22538)

diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
index 7fe8dce1a3ea153a27ebbc612f751a4fc9194603..09b9ed31cd122259872fabec6a4b52c1a1f526d7 100644 (file)
--- a/src/libstd/sys/windows/thread.rs
+++ b/src/libstd/sys/windows/thread.rs
@@ -11,7 +11,6 @@
 use prelude::v1::*;
 
 use boxed;
-use boxed::Box;
 use cmp;
 use io;
 use mem;

diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs
index cf942b5d025330cc80c083663521e4cd5001dd39..697164915ce7f42e007408791796a848f354fa73 100644 (file)
--- a/src/libstd/sys/windows/thread_local.rs
+++ b/src/libstd/sys/windows/thread_local.rs
@@ -12,6 +12,7 @@
 
 use libc::types::os::arch::extra::{DWORD, LPVOID, BOOL};
 
+use boxed;
 use mem;
 use ptr;
 use rt;
@@ -139,7 +140,7 @@ unsafe fn init_dtors() {
         DTOR_LOCK.lock();
         let dtors = DTORS;
         DTORS = ptr::null_mut();
-        Boxed::from_raw(dtors);
+        Box::from_raw(dtors);
         assert!(DTORS.is_null()); // can't re-init after destructing
         DTOR_LOCK.unlock();
     });