---

yaml
---
r: 192950
b: refs/heads/beta
c: 1beaebb
h: refs/heads/master
v: v3

Author: Manishearth

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: d6d33770da9b831248c782a421d4c9cbd99791ff
+refs/heads/beta: 1beaebbaa69be535d00592e2ac37af4dcba427d9
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/src/libstd/sys/windows/thread.rs

@@ -11,7 +11,6 @@
 use prelude::v1::*;
 
 use boxed;
-use boxed::Box;
 use cmp;
 use io;
 use mem;

branches/beta/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();
     });