Update to rust master

4 files changed, 8 insertions, 8 deletions

diff --git a/tests/all.rs b/tests/all.rs
index 590d7d9..448c6a6 100644
--- a/tests/all.rs
+++ b/tests/all.rs
@@ -4,7 +4,7 @@ extern crate libc;
 use std::mem;
 use std::num::Int;
 use std::os;
-use std::io::TcpStream;
+use std::old_io::TcpStream;
 
 mod agent;
 mod session;
diff --git a/tests/channel.rs b/tests/channel.rs
index 5ff1e19..5879056 100644
--- a/tests/channel.rs
+++ b/tests/channel.rs
@@ -1,4 +1,4 @@
-use std::io::{TcpListener, Listener, Acceptor, TcpStream};
+use std::old_io::{TcpListener, Listener, Acceptor, TcpStream};
 use std::thread::Thread;
 
 #[test]
diff --git a/tests/session.rs b/tests/session.rs
index 1040dad..41eb5e0 100644
--- a/tests/session.rs
+++ b/tests/session.rs
@@ -1,5 +1,5 @@
 use std::os;
-use std::io::{self, File, TempDir};
+use std::old_io::{self, File, TempDir};
 
 use ssh2::{self, Session, MethodType, HashType};
 
@@ -65,7 +65,7 @@ fn scp_send() {
     let td = TempDir::new("test").unwrap();
     let (_tcp, sess) = ::authed_session();
     let mut ch = sess.scp_send(&td.path().join("foo"),
-                               io::USER_FILE, 6, None).unwrap();
+                               old_io::USER_FILE, 6, None).unwrap();
     ch.write(b"foobar").unwrap();
     drop(ch);
     let actual = File::open(&td.path().join("foo")).read_to_end().unwrap();
diff --git a/tests/sftp.rs b/tests/sftp.rs
index c6ebd78..f7da4c8 100644
--- a/tests/sftp.rs
+++ b/tests/sftp.rs
@@ -1,5 +1,5 @@
-use std::io::{self, fs, File, TempDir};
-use std::io::fs::PathExtensions;
+use std::old_io::{self, fs, File, TempDir};
+use std::old_io::fs::PathExtensions;
 
 #[test]
 fn smoke() {
@@ -11,13 +11,13 @@ fn smoke() {
 fn ops() {
     let td = TempDir::new("foo").unwrap();
     File::create(&td.path().join("foo")).unwrap();
-    fs::mkdir(&td.path().join("bar"), io::USER_DIR).unwrap();
+    fs::mkdir(&td.path().join("bar"), old_io::USER_DIR).unwrap();
 
     let (_tcp, sess) = ::authed_session();
     let sftp = sess.sftp().unwrap();
     sftp.opendir(&td.path().join("bar")).unwrap();
     let mut foo = sftp.open(&td.path().join("foo")).unwrap();
-    sftp.mkdir(&td.path().join("bar2"), io::USER_DIR).unwrap();
+    sftp.mkdir(&td.path().join("bar2"), old_io::USER_DIR).unwrap();
     assert!(td.path().join("bar2").is_dir());
     sftp.rmdir(&td.path().join("bar2")).unwrap();