diff options
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | libssh2-sys/Cargo.toml | 3 | ||||
| -rw-r--r-- | libssh2-sys/build.rs | 2 | ||||
| -rw-r--r-- | libssh2-sys/lib.rs | 1 | ||||
| -rw-r--r-- | src/lib.rs | 3 | ||||
| -rw-r--r-- | tests/all.rs | 2 | ||||
| -rw-r--r-- | tests/channel.rs | 10 |
7 files changed, 13 insertions, 11 deletions
@@ -1,6 +1,6 @@ [package] name = "ssh2" -version = "0.1.9" +version = "0.1.10" authors = ["Alex Crichton <alex@alexcrichton.com>"] license = "MIT/Apache-2.0" keywords = ["ssh"] @@ -18,6 +18,7 @@ name = "all" [dependencies] bitflags = "0.1" +libc = "0.1" [dependencies.libssh2-sys] path = "libssh2-sys" diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml index 6a6ec55..9576bc0 100644 --- a/libssh2-sys/Cargo.toml +++ b/libssh2-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libssh2-sys" -version = "0.1.6" +version = "0.1.7" authors = ["Alex Crichton <alex@alexcrichton.com>"] links = "ssh2" build = "build.rs" @@ -14,6 +14,7 @@ path = "lib.rs" [dependencies] libz-sys = "0.1.0" +libc = "0.1" [target.i686-apple-darwin.dependencies] openssl-sys = "0.4.0" diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs index 1da101c..6a8facc 100644 --- a/libssh2-sys/build.rs +++ b/libssh2-sys/build.rs @@ -1,4 +1,4 @@ -#![feature(io, path, env, core)] +#![feature(old_io, old_path, env, core)] extern crate "pkg-config" as pkg_config; diff --git a/libssh2-sys/lib.rs b/libssh2-sys/lib.rs index 59e0adc..17e5c17 100644 --- a/libssh2-sys/lib.rs +++ b/libssh2-sys/lib.rs @@ -1,6 +1,5 @@ #![allow(bad_style)] #![allow(missing_copy_implementations)] -#![feature(libc)] extern crate libc; @@ -114,7 +114,8 @@ //! let contents = remote_file.read_to_end(); //! ``` -#![feature(unsafe_destructor, std_misc, collections, io, core, path, hash, libc)] +#![feature(unsafe_destructor, std_misc, collections, old_io, core, old_path, hash)] +#![feature(io)] #![deny(missing_docs, unused_results)] #![cfg_attr(test, deny(warnings))] diff --git a/tests/all.rs b/tests/all.rs index 749e976..491e4d4 100644 --- a/tests/all.rs +++ b/tests/all.rs @@ -1,5 +1,5 @@ #![deny(warnings)] -#![feature(io, core, path, std_misc, libc, env)] +#![feature(old_io, core, old_path, env)] extern crate ssh2; extern crate libc; diff --git a/tests/channel.rs b/tests/channel.rs index 3150f40..254f0fe 100644 --- a/tests/channel.rs +++ b/tests/channel.rs @@ -1,5 +1,5 @@ use std::old_io::{TcpListener, Listener, Acceptor, TcpStream}; -use std::thread::Thread; +use std::thread; #[test] fn smoke() { @@ -67,7 +67,7 @@ fn direct() { let mut l = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = l.socket_name().unwrap(); let mut a = l.listen().unwrap(); - let t = Thread::scoped(move|| { + let t = thread::scoped(move|| { let mut s = a.accept().unwrap(); let b = &mut [0, 0, 0]; s.read(b).unwrap(); @@ -81,7 +81,7 @@ fn direct() { let r = &mut [0, 0, 0]; channel.read(r).unwrap(); assert_eq!(r.as_slice(), [4, 5, 6].as_slice()); - t.join().ok().unwrap(); + t.join(); } #[test] @@ -89,7 +89,7 @@ fn forward() { let (_tcp, sess) = ::authed_session(); let (mut listen, port) = sess.channel_forward_listen(39249, None, None) .unwrap(); - let t = Thread::scoped(move|| { + 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(); @@ -102,5 +102,5 @@ fn forward() { let r = &mut [0, 0, 0]; channel.read(r).unwrap(); assert_eq!(r.as_slice(), [4, 5, 6].as_slice()); - t.join().ok().unwrap(); + t.join(); } |