Auto merge of #21522 - nikomatsakis:assoc-type-ice-hunt-take-3, r=nick29581

[rust.git] / src / libstd / thread.rs

diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs
index 09f50059936ab8285754c2ec9529e7f6e475f77d..c19ec8ea25c641db80f09634b9a799b7a5ec2000 100644 (file)
--- a/src/libstd/thread.rs
+++ b/src/libstd/thread.rs
@@ -158,7 +158,7 @@
 use str::Str;
 use string::String;
 use rt::{self, unwind};
-use io::{Writer, stdio};
+use old_io::{Writer, stdio};
 use thunk::Thunk;
 
 use sys::thread as imp;
@@ -516,7 +516,7 @@ mod test {
     use sync::mpsc::{channel, Sender};
     use boxed::BoxAny;
     use result;
-    use std::io::{ChanReader, ChanWriter};
+    use std::old_io::{ChanReader, ChanWriter};
     use super::{Thread, Builder};
     use thunk::Thunk;