about summary refs log tree commit diff
path: root/src/libstd/thread.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-01-27 02:46:09 +0000
committerbors <bors@rust-lang.org>2015-01-27 02:46:09 +0000
commita6a6fadbb97268d2b3e47649d91053fbb4827266 (patch)
tree66fdcc5956c3fad65f8484243903edf8771ad3a1 /src/libstd/thread.rs
parenta637365b10c175e23af40171af1724d5474cb303 (diff)
parent5d836cdf8666ce0af6911a0c89dffea4da74b374 (diff)
downloadrust-a6a6fadbb97268d2b3e47649d91053fbb4827266.tar.gz
rust-a6a6fadbb97268d2b3e47649d91053fbb4827266.zip
Auto merge of #21543 - alexcrichton:old-io, r=aturon
In preparation for the I/O rejuvination of the standard library, this commit
renames the current `io` module to `old_io` in order to make room for the new
I/O modules. It is expected that the I/O RFCs will land incrementally over time
instead of all at once, and this provides a fresh clean path for new modules to
enter into as well as guaranteeing that all old infrastructure will remain in
place for some time.

As each `old_io` module is replaced it will be deprecated in-place for new
structures in `std::{io, fs, net}` (as appropriate).

This commit does *not* leave a reexport of `old_io as io` as the deprecation
lint does not currently warn on this form of use. This is quite a large breaking
change for all imports in existing code, but all functionality is retained
precisely as-is and path statements simply need to be renamed from `io` to
`old_io`.

[breaking-change]
Diffstat (limited to 'src/libstd/thread.rs')
-rw-r--r--src/libstd/thread.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs
index a86b82b8c62..4d932b3e777 100644
--- a/src/libstd/thread.rs
+++ b/src/libstd/thread.rs
@@ -158,7 +158,7 @@ use sync::{Mutex, Condvar, Arc};
 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;
@@ -508,7 +508,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;