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, 24 insertions, 24 deletions

diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs
index 213b7ba11b7..aa3af76d46c 100644
--- a/src/libterm/lib.rs
+++ b/src/libterm/lib.rs
@@ -70,7 +70,7 @@ pub use terminfo::TerminfoTerminal;
 #[cfg(windows)]
 pub use win::WinConsole;
 
-use std::io::IoResult;
+use std::old_io::IoResult;
 
 pub mod terminfo;
 
@@ -85,8 +85,8 @@ pub struct WriterWrapper {
 
 impl Writer for WriterWrapper {
     #[inline]
-    fn write(&mut self, buf: &[u8]) -> IoResult<()> {
-        self.wrapped.write(buf)
+    fn write_all(&mut self, buf: &[u8]) -> IoResult<()> {
+        self.wrapped.write_all(buf)
     }
 
     #[inline]
@@ -100,7 +100,7 @@ impl Writer for WriterWrapper {
 /// opened.
 pub fn stdout() -> Option<Box<Terminal<WriterWrapper> + Send>> {
     TerminfoTerminal::new(WriterWrapper {
-        wrapped: box std::io::stdout() as Box<Writer + Send>,
+        wrapped: box std::old_io::stdout() as Box<Writer + Send>,
     })
 }
 
@@ -109,14 +109,14 @@ pub fn stdout() -> Option<Box<Terminal<WriterWrapper> + Send>> {
 /// opened.
 pub fn stdout() -> Option<Box<Terminal<WriterWrapper> + Send>> {
     let ti = TerminfoTerminal::new(WriterWrapper {
-        wrapped: box std::io::stdout() as Box<Writer + Send>,
+        wrapped: box std::old_io::stdout() as Box<Writer + Send>,
     });
 
     match ti {
         Some(t) => Some(t),
         None => {
             WinConsole::new(WriterWrapper {
-                wrapped: box std::io::stdout() as Box<Writer + Send>,
+                wrapped: box std::old_io::stdout() as Box<Writer + Send>,
             })
         }
     }
@@ -127,7 +127,7 @@ pub fn stdout() -> Option<Box<Terminal<WriterWrapper> + Send>> {
 /// opened.
 pub fn stderr() -> Option<Box<Terminal<WriterWrapper> + Send>> {
     TerminfoTerminal::new(WriterWrapper {
-        wrapped: box std::io::stderr() as Box<Writer + Send>,
+        wrapped: box std::old_io::stderr() as Box<Writer + Send>,
     })
 }
 
@@ -136,14 +136,14 @@ pub fn stderr() -> Option<Box<Terminal<WriterWrapper> + Send>> {
 /// opened.
 pub fn stderr() -> Option<Box<Terminal<WriterWrapper> + Send>> {
     let ti = TerminfoTerminal::new(WriterWrapper {
-        wrapped: box std::io::stderr() as Box<Writer + Send>,
+        wrapped: box std::old_io::stderr() as Box<Writer + Send>,
     });
 
     match ti {
         Some(t) => Some(t),
         None => {
             WinConsole::new(WriterWrapper {
-                wrapped: box std::io::stderr() as Box<Writer + Send>,
+                wrapped: box std::old_io::stderr() as Box<Writer + Send>,
             })
         }
     }
diff --git a/src/libterm/terminfo/mod.rs b/src/libterm/terminfo/mod.rs
index 2ef0bca3785..a8df045e203 100644
--- a/src/libterm/terminfo/mod.rs
+++ b/src/libterm/terminfo/mod.rs
@@ -11,7 +11,7 @@
 //! Terminfo database interface.
 
 use std::collections::HashMap;
-use std::io::IoResult;
+use std::old_io::IoResult;
 use std::os;
 
 use attr;
@@ -83,7 +83,7 @@ impl<T: Writer+Send> Terminal<T> for TerminfoTerminal<T> {
                                .as_slice(),
                            &[Number(color as int)], &mut Variables::new());
             if s.is_ok() {
-                try!(self.out.write(s.unwrap().as_slice()));
+                try!(self.out.write_all(s.unwrap().as_slice()));
                 return Ok(true)
             }
         }
@@ -100,7 +100,7 @@ impl<T: Writer+Send> Terminal<T> for TerminfoTerminal<T> {
                                .as_slice(),
                            &[Number(color as int)], &mut Variables::new());
             if s.is_ok() {
-                try!(self.out.write(s.unwrap().as_slice()));
+                try!(self.out.write_all(s.unwrap().as_slice()));
                 return Ok(true)
             }
         }
@@ -119,7 +119,7 @@ impl<T: Writer+Send> Terminal<T> for TerminfoTerminal<T> {
                                    &[],
                                    &mut Variables::new());
                     if s.is_ok() {
-                        try!(self.out.write(s.unwrap().as_slice()));
+                        try!(self.out.write_all(s.unwrap().as_slice()));
                         return Ok(true)
                     }
                 }
@@ -154,7 +154,7 @@ impl<T: Writer+Send> Terminal<T> for TerminfoTerminal<T> {
             expand(op.as_slice(), &[], &mut Variables::new())
         });
         if s.is_ok() {
-            return self.out.write(s.unwrap().as_slice())
+            return self.out.write_all(s.unwrap().as_slice())
         }
         Ok(())
     }
@@ -221,8 +221,8 @@ impl<T: Writer+Send> TerminfoTerminal<T> {
 
 
 impl<T: Writer> Writer for TerminfoTerminal<T> {
-    fn write(&mut self, buf: &[u8]) -> IoResult<()> {
-        self.out.write(buf)
+    fn write_all(&mut self, buf: &[u8]) -> IoResult<()> {
+        self.out.write_all(buf)
     }
 
     fn flush(&mut self) -> IoResult<()> {
diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs
index eb300beae9f..f82c3ea2e7b 100644
--- a/src/libterm/terminfo/parser/compiled.rs
+++ b/src/libterm/terminfo/parser/compiled.rs
@@ -13,7 +13,7 @@
 //! ncurses-compatible compiled terminfo format parsing (term(5))
 
 use std::collections::HashMap;
-use std::io;
+use std::old_io;
 use super::super::TermInfo;
 
 // These are the orders ncurses uses in its compiled format (as of 5.9). Not sure if portable.
@@ -158,7 +158,7 @@ pub static stringnames: &'static[&'static str] = &[ "cbt", "_", "cr", "csr", "tb
     "box1"];
 
 /// Parse a compiled terminfo entry, using long capability names if `longnames` is true
-pub fn parse(file: &mut io::Reader, longnames: bool)
+pub fn parse(file: &mut old_io::Reader, longnames: bool)
              -> Result<Box<TermInfo>, String> {
     macro_rules! try { ($e:expr) => (
         match $e {
@@ -340,6 +340,6 @@ mod test {
     #[ignore(reason = "no ncurses on buildbots, needs a bundled terminfo file to test against")]
     fn test_parse() {
         // FIXME #6870: Distribute a compiled file in src/tests and test there
-        // parse(io::fs_reader(&p("/usr/share/terminfo/r/rxvt-256color")).unwrap(), false);
+        // parse(old_io::fs_reader(&p("/usr/share/terminfo/r/rxvt-256color")).unwrap(), false);
     }
 }
diff --git a/src/libterm/terminfo/searcher.rs b/src/libterm/terminfo/searcher.rs
index 1fca3c62f78..1e84c0462d6 100644
--- a/src/libterm/terminfo/searcher.rs
+++ b/src/libterm/terminfo/searcher.rs
@@ -12,8 +12,8 @@
 //!
 //! Does not support hashed database, only filesystem!
 
-use std::io::File;
-use std::io::fs::PathExtensions;
+use std::old_io::File;
+use std::old_io::fs::PathExtensions;
 use std::os::getenv;
 use std::os;
 
diff --git a/src/libterm/win.rs b/src/libterm/win.rs
index 3130ad0af3f..a56613681c8 100644
--- a/src/libterm/win.rs
+++ b/src/libterm/win.rs
@@ -14,7 +14,7 @@
 
 extern crate libc;
 
-use std::io::IoResult;
+use std::old_io::IoResult;
 
 use attr;
 use color;
@@ -130,8 +130,8 @@ impl<T: Writer+Send> WinConsole<T> {
 }
 
 impl<T: Writer> Writer for WinConsole<T> {
-    fn write(&mut self, buf: &[u8]) -> IoResult<()> {
-        self.buf.write(buf)
+    fn write_all(&mut self, buf: &[u8]) -> IoResult<()> {
+        self.buf.write_all(buf)
     }
 
     fn flush(&mut self) -> IoResult<()> {