about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-17 15:24:34 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-17 17:27:46 -0800
commit6ac3799b75780f8c18bc38331403e1e517b89bab (patch)
treeeb26c741e10643d7ed35960a401bb233f16891e2 /src/libstd/sys
parentb283881dcc45466d7fe0e14bf76f1d593f7e30b0 (diff)
downloadrust-6ac3799b75780f8c18bc38331403e1e517b89bab.tar.gz
rust-6ac3799b75780f8c18bc38331403e1e517b89bab.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/windows/thread.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
index d7f86e1842e..f3a27877e5c 100644
--- a/src/libstd/sys/windows/thread.rs
+++ b/src/libstd/sys/windows/thread.rs
@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use boxed::Box;
+use prelude::v1::*;
+
 use cmp;
 use io;
 use mem;