---

yaml
---
r: 192951
b: refs/heads/beta
c: ee6f2a1
h: refs/heads/master
i:
  192949: 3f45953
  192947: 6e9dcc5
  192943: 9aaccab
v: v3

Author: alexcrichton

[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: 1beaebbaa69be535d00592e2ac37af4dcba427d9
+refs/heads/beta: ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/src/libstd/lib.rs

@@ -122,6 +122,7 @@
 #![feature(unsafe_destructor)]
 #![feature(unsafe_no_drop_flag)]
 #![feature(macro_reexport)]
+#![feature(hash)]
 #![cfg_attr(test, feature(test, rustc_private, env))]
 
 // Don't link to std. We are std.

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

@@ -13,7 +13,6 @@ use prelude::v1::*;
 use boxed;
 use cmp;
 use io;
-use mem;
 use ptr;
 use libc;
 use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES, SIZE_T, BOOL,

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

@@ -13,7 +13,6 @@ use prelude::v1::*;
 use libc::types::os::arch::extra::{DWORD, LPVOID, BOOL};
 
 use boxed;
-use mem;
 use ptr;
 use rt;
 use sys_common::mutex::{MUTEX_INIT, Mutex};

branches/beta/src/libstd/thread_local/mod.rs

@@ -330,7 +330,6 @@ impl<T: 'static> Key<T> {
 mod imp {
     use prelude::v1::*;
 
-    use alloc::boxed;
     use cell::UnsafeCell;
     use intrinsics;
     use ptr;
@@ -389,6 +388,7 @@ mod imp {
     // Due to rust-lang/rust#18804, make sure this is not generic!
     #[cfg(target_os = "linux")]
     unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) {
+        use boxed;
         use mem;
         use libc;
         use sys_common::thread_local as os;