Test fixes and rebase conflicts

Author: alexcrichton

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.

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,

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};

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;