Skip to content

Commit 1beaebb

Browse files
Manishearthalexcrichton
authored andcommitted
Fix windows failure (fixup rust-lang#22538)
1 parent d6d3377 commit 1beaebb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/libstd/sys/windows/thread.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use prelude::v1::*;
1212

1313
use boxed;
14-
use boxed::Box;
1514
use cmp;
1615
use io;
1716
use mem;

src/libstd/sys/windows/thread_local.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use prelude::v1::*;
1212

1313
use libc::types::os::arch::extra::{DWORD, LPVOID, BOOL};
1414

15+
use boxed;
1516
use mem;
1617
use ptr;
1718
use rt;
@@ -139,7 +140,7 @@ unsafe fn init_dtors() {
139140
DTOR_LOCK.lock();
140141
let dtors = DTORS;
141142
DTORS = ptr::null_mut();
142-
Boxed::from_raw(dtors);
143+
Box::from_raw(dtors);
143144
assert!(DTORS.is_null()); // can't re-init after destructing
144145
DTOR_LOCK.unlock();
145146
});

0 commit comments

Comments
 (0)