Merge remote-tracking branch 'rust-lang/master'

Conflicts:
	src/libcore/cell.rs
	src/librustc_driver/test.rs
	src/libstd/old_io/net/tcp.rs
	src/libstd/old_io/process.rs

5 files changed, 8 insertions, 8 deletions

diff --git a/src/rustbook/book.rs b/src/rustbook/book.rs
index 3047e93137f..2707a6346c8 100644
--- a/src/rustbook/book.rs
+++ b/src/rustbook/book.rs
@@ -10,7 +10,7 @@
 
 //! Basic data structures for representing a book.
 
-use std::io::BufferedReader;
+use std::old_io::BufferedReader;
 use std::iter;
 use std::iter::AdditiveIterator;
 
diff --git a/src/rustbook/build.rs b/src/rustbook/build.rs
index 93601c0f61b..ccb572a113a 100644
--- a/src/rustbook/build.rs
+++ b/src/rustbook/build.rs
@@ -11,8 +11,8 @@
 //! Implementation of the `build` subcommand, used to compile a book.
 
 use std::os;
-use std::io;
-use std::io::{fs, File, BufferedWriter, TempDir, IoResult};
+use std::old_io;
+use std::old_io::{fs, File, BufferedWriter, TempDir, IoResult};
 
 use subcommand::Subcommand;
 use term::Term;
@@ -119,7 +119,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
             try!(writeln!(&mut toc, "</div></div>"));
         }
 
-        try!(fs::mkdir_recursive(&out_path, io::USER_DIR));
+        try!(fs::mkdir_recursive(&out_path, old_io::USER_DIR));
 
         let rustdoc_args: &[String] = &[
             "".to_string(),
@@ -165,7 +165,7 @@ impl Subcommand for Build {
             tgt = Path::new(os::args()[3].clone());
         }
 
-        try!(fs::mkdir(&tgt, io::USER_DIR));
+        try!(fs::mkdir(&tgt, old_io::USER_DIR));
 
         try!(File::create(&tgt.join("rust-book.css")).write_str(css::STYLE));
 
diff --git a/src/rustbook/error.rs b/src/rustbook/error.rs
index 7d5e7efcc94..d4829a2c391 100644
--- a/src/rustbook/error.rs
+++ b/src/rustbook/error.rs
@@ -13,7 +13,7 @@
 use std::fmt;
 use std::fmt::{Show, Formatter};
 
-use std::io::IoError;
+use std::old_io::IoError;
 
 pub type CliError = Box<Error + 'static>;
 pub type CliResult<T> = Result<T, CliError>;
diff --git a/src/rustbook/term.rs b/src/rustbook/term.rs
index 471e22ce7c1..b922bf1cdd3 100644
--- a/src/rustbook/term.rs
+++ b/src/rustbook/term.rs
@@ -12,7 +12,7 @@
 //! verbosity support. For now, just a wrapper around stdout/stderr.
 
 use std::os;
-use std::io::stdio;
+use std::old_io::stdio;
 
 pub struct Term {
     err: Box<Writer + 'static>
diff --git a/src/rustbook/test.rs b/src/rustbook/test.rs
index f2bf92585f7..db02481cb02 100644
--- a/src/rustbook/test.rs
+++ b/src/rustbook/test.rs
@@ -16,7 +16,7 @@ use error::CommandResult;
 use error::Error;
 use term::Term;
 use book;
-use std::io::{Command, File};
+use std::old_io::{Command, File};
 use std::os;
 
 struct Test;