summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.toml2
-rw-r--r--libssh2-sys/Cargo.toml2
-rw-r--r--libssh2-sys/build.rs6
-rw-r--r--src/lib.rs2
-rw-r--r--src/sftp.rs4
-rw-r--r--tests/all.rs4
-rw-r--r--tests/channel.rs24
-rw-r--r--tests/knownhosts.rs2
-rw-r--r--tests/session.rs6
9 files changed, 27 insertions, 25 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 6cabcf8..63cc0dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "ssh2"
-version = "0.2.3"
+version = "0.2.4"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = "MIT/Apache-2.0"
keywords = ["ssh"]
diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml
index 56545c4..149f6a8 100644
--- a/libssh2-sys/Cargo.toml
+++ b/libssh2-sys/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "libssh2-sys"
-version = "0.1.13"
+version = "0.1.14"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
links = "ssh2"
build = "build.rs"
diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs
index 703199c..db808a0 100644
--- a/libssh2-sys/build.rs
+++ b/libssh2-sys/build.rs
@@ -1,3 +1,5 @@
+#![feature(convert)]
+
extern crate "pkg-config" as pkg_config;
use std::env;
@@ -40,8 +42,8 @@ fn main() {
Err(..) => {}
}
- let src = PathBuf::new(&env::var_os("CARGO_MANIFEST_DIR").unwrap());
- let dst = PathBuf::new(&env::var_os("OUT_DIR").unwrap());
+ let src = PathBuf::from(&env::var_os("CARGO_MANIFEST_DIR").unwrap());
+ let dst = PathBuf::from(&env::var_os("OUT_DIR").unwrap());
let mut config_opts = Vec::new();
if windows {
diff --git a/src/lib.rs b/src/lib.rs
index 9019bbf..59a6b96 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -124,7 +124,7 @@
//! ```
#![doc(html_root_url = "http://alexcrichton.com/ssh2-rs")]
-#![feature(unsafe_destructor, std_misc, collections, io, core, io_ext)]
+#![feature(unsafe_destructor, std_misc, collections, io, io_ext, convert)]
#![deny(missing_docs, unused_results)]
#![cfg_attr(test, deny(warnings))]
diff --git a/src/sftp.rs b/src/sftp.rs
index d4f4a0c..d4646dc 100644
--- a/src/sftp.rs
+++ b/src/sftp.rs
@@ -555,10 +555,10 @@ impl FileStat {
fn mkpath(v: Vec<u8>) -> PathBuf {
use std::os::unix::prelude::*;
use std::ffi::OsStr;
- PathBuf::new(<OsStr as OsStrExt>::from_bytes(&v))
+ PathBuf::from(OsStr::from_bytes(&v))
}
#[cfg(windows)]
fn mkpath(v: Vec<u8>) -> PathBuf {
use std::str;
- PathBuf::new(str::from_utf8(&v).unwrap())
+ PathBuf::from(str::from_utf8(&v).unwrap())
}
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 09:04:06 +0000