---

yaml
---
r: 185279
b: refs/heads/master
c: 1beaebb
h: refs/heads/master
i:
  185277: 491a2a9
  185275: 1b16d5d
  185271: bf77728
  185263: 0423141
  185247: 2002db9
  185215: 3e3825f
v: v3

Author: Manishearth

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d6d33770da9b831248c782a421d4c9cbd99791ff
+refs/heads/master: 1beaebbaa69be535d00592e2ac37af4dcba427d9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
 refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/src/libstd/sys/windows/thread.rs

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

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