Update to rust master

4 files changed, 18 insertions, 18 deletions

diff --git a/tests/all.rs b/tests/all.rs
index 74c38b1..5930a8f 100644
--- a/tests/all.rs
+++ b/tests/all.rs
@@ -1,5 +1,5 @@
 #![deny(warnings)]
-#![feature(core)]
+#![feature(convert)]
 
 extern crate ssh2;
 extern crate libc;
@@ -30,7 +30,7 @@ pub fn authed_session() -> (TcpStream, ssh2::Session) {
         agent.connect().unwrap();
         agent.list_identities().unwrap();
         let identity = agent.identities().next().unwrap().unwrap();
-        agent.userauth(user.as_slice(), &identity).unwrap();
+        agent.userauth(&user, &identity).unwrap();
     }
     assert!(sess.authenticated());
     (socket, sess)
diff --git a/tests/channel.rs b/tests/channel.rs
index 128e425..9db5a94 100644
--- a/tests/channel.rs
+++ b/tests/channel.rs
@@ -72,18 +72,18 @@ fn direct() {
     let addr = a.local_addr().unwrap();
     let t = thread::scoped(move|| {
         let mut s = a.accept().unwrap().0;
-        let b = &mut [0, 0, 0];
-        s.read(b).unwrap();
-        assert_eq!(b.as_slice(), [1, 2, 3].as_slice());
+        let mut b = [0, 0, 0];
+        s.read(&mut b).unwrap();
+        assert_eq!(b, [1, 2, 3]);
         s.write_all(&[4, 5, 6]).unwrap();
     });
     let (_tcp, sess) = ::authed_session();
     let mut channel = sess.channel_direct_tcpip("127.0.0.1",
                                                 addr.port(), None).unwrap();
     channel.write_all(&[1, 2, 3]).unwrap();
-    let r = &mut [0, 0, 0];
-    channel.read(r).unwrap();
-    assert_eq!(r.as_slice(), [4, 5, 6].as_slice());
+    let mut r = [0, 0, 0];
+    channel.read(&mut r).unwrap();
+    assert_eq!(r, [4, 5, 6]);
     t.join();
 }
 
@@ -94,16 +94,16 @@ fn forward() {
                                  .unwrap();
     let t = thread::scoped(move|| {
         let mut s = TcpStream::connect(&("127.0.0.1", port)).unwrap();
-        let b = &mut [0, 0, 0];
-        s.read(b).unwrap();
-        assert_eq!(b.as_slice(), [1, 2, 3].as_slice());
+        let mut b = [0, 0, 0];
+        s.read(&mut b).unwrap();
+        assert_eq!(b, [1, 2, 3]);
         s.write_all(&[4, 5, 6]).unwrap();
     });
 
     let mut channel = listen.accept().unwrap();
     channel.write_all(&[1, 2, 3]).unwrap();
-    let r = &mut [0, 0, 0];
-    channel.read(r).unwrap();
-    assert_eq!(r.as_slice(), [4, 5, 6].as_slice());
+    let mut r = [0, 0, 0];
+    channel.read(&mut r).unwrap();
+    assert_eq!(r, [4, 5, 6]);
     t.join();
 }
diff --git a/tests/knownhosts.rs b/tests/knownhosts.rs
index aa18865..d23d213 100644
--- a/tests/knownhosts.rs
+++ b/tests/knownhosts.rs
@@ -35,6 +35,6 @@ CZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2R\
 PW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi\
 /w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==");
 
-    assert_eq!(hosts.write_string(&host, KnownHostFileKind::OpenSSH).unwrap().as_slice(), encoded);
+    assert_eq!(hosts.write_string(&host, KnownHostFileKind::OpenSSH).unwrap(), encoded);
     hosts.remove(host).unwrap();
 }
diff --git a/tests/session.rs b/tests/session.rs
index 36f8c7c..f8b378e 100644
--- a/tests/session.rs
+++ b/tests/session.rs
@@ -31,7 +31,7 @@ fn smoke_handshake() {
     let mut sess = Session::new().unwrap();
     sess.handshake(&socket).unwrap();
     sess.host_key().unwrap();
-    let methods = sess.auth_methods(user.as_slice()).unwrap();
+    let methods = sess.auth_methods(&user).unwrap();
     assert!(methods.contains("publickey"), "{}", methods);
     assert!(!sess.authenticated());
 
@@ -40,7 +40,7 @@ fn smoke_handshake() {
     agent.list_identities().unwrap();
     {
         let identity = agent.identities().next().unwrap().unwrap();
-        agent.userauth(user.as_slice(), &identity).unwrap();
+        agent.userauth(&user, &identity).unwrap();
     }
     assert!(sess.authenticated());
     sess.host_key_hash(HashType::Md5).unwrap();
@@ -59,7 +59,7 @@ fn scp_recv() {
     let (mut ch, _) = sess.scp_recv(Path::new(".ssh/authorized_keys")).unwrap();
     let mut data = String::new();
     ch.read_to_string(&mut data).unwrap();
-    let p = PathBuf::new(&env::var("HOME").unwrap()).join(".ssh/authorized_keys");
+    let p = PathBuf::from(env::var("HOME").unwrap()).join(".ssh/authorized_keys");
     let mut expected = String::new();
     File::open(&p).unwrap().read_to_string(&mut expected).unwrap();
     assert!(data == expected);