diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-24 00:49:50 +0530 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-23 11:44:00 -0800 |
| commit | 1beaebbaa69be535d00592e2ac37af4dcba427d9 (patch) | |
| tree | 8084fe1d707aa4f9d02ca5c0ec8de7bc468edf83 /src/libstd/sys/windows | |
| parent | d6d33770da9b831248c782a421d4c9cbd99791ff (diff) | |
| download | rust-1beaebbaa69be535d00592e2ac37af4dcba427d9.tar.gz rust-1beaebbaa69be535d00592e2ac37af4dcba427d9.zip | |
Fix windows failure (fixup #22538)
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/thread.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/windows/thread_local.rs | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs index 7fe8dce1a3e..09b9ed31cd1 100644 --- 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 cf942b5d025..697164915ce 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.rs @@ -12,6 +12,7 @@ use prelude::v1::*; 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(); }); |