From ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 23 Feb 2015 11:52:31 -0800
Subject: Test fixes and rebase conflicts

---
 src/libstd/sys/windows/thread.rs       | 1 -
 src/libstd/sys/windows/thread_local.rs | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/libstd/sys/windows')

diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
index 09b9ed31cd1..aa22b6b1307 100644
--- a/src/libstd/sys/windows/thread.rs
+++ b/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,
diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs
index 697164915ce..30c483ac52f 100644
--- a/src/libstd/sys/windows/thread_local.rs
+++ b/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};
-- 
cgit 1.4.1-3-g733a5