Test fixes and rebase conflicts

2015-02-23 11:52:31 -08:00
parent 1beaebbaa6
commit ee6f2a1ad6
4 changed files with 2 additions and 3 deletions
--- 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,