diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-23 11:52:31 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-23 12:46:11 -0800 |
| commit | ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043 (patch) | |
| tree | 1c2a90b8e1aac6793a0fbf6350778a5b9ac65dae /src/libstd/sys | |
| parent | 1beaebbaa69be535d00592e2ac37af4dcba427d9 (diff) | |
| download | rust-ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043.tar.gz rust-ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/thread.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/windows/thread_local.rs | 1 |
2 files changed, 0 insertions, 2 deletions
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}; |