summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libssh2-sys/Cargo.toml2
-rw-r--r--libssh2-sys/build.rs2
-rw-r--r--tests/all.rs3
-rw-r--r--tests/session.rs3
-rw-r--r--tests/sftp.rs4
-rw-r--r--tests/tempdir.rs17
6 files changed, 4 insertions, 27 deletions
diff --git a/libssh2-sys/Cargo.toml b/libssh2-sys/Cargo.toml
index b247499..755b594 100644
--- a/libssh2-sys/Cargo.toml
+++ b/libssh2-sys/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "libssh2-sys"
-version = "0.1.9"
+version = "0.1.10"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
links = "ssh2"
build = "build.rs"
diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs
index 8f5a332..aac8bab 100644
--- a/libssh2-sys/build.rs
+++ b/libssh2-sys/build.rs
@@ -124,7 +124,5 @@ fn which(cmd: &str) -> Option<PathBuf> {
let cmd = format!("{}{}", cmd, env::consts::EXE_SUFFIX);
env::split_paths(&env::var("PATH").unwrap()).map(|p| {
p.join(&cmd)
- }).map(|p| {
- PathBuf::new(p.to_str().unwrap())
}).find(|p| p.exists())
}
diff --git a/tests/all.rs b/tests/all.rs
index b905530..9ff2e0c 100644
--- a/tests/all.rs
+++ b/tests/all.rs
@@ -1,5 +1,5 @@
#![deny(warnings)]
-#![feature(io, core, path, env, net, fs, old_io, old_path)]
+#![feature(io, core, path, env, net, fs, tempdir)]
extern crate ssh2;
extern crate libc;
@@ -12,7 +12,6 @@ mod session;
mod channel;
mod knownhosts;
mod sftp;
-mod tempdir;
pub fn socket() -> TcpStream {
TcpStream::connect("127.0.0.1:22").unwrap()
diff --git a/tests/session.rs b/tests/session.rs
index 36f8c7c..fbfadfc 100644
--- a/tests/session.rs
+++ b/tests/session.rs
@@ -1,8 +1,7 @@
use std::env;
-use std::fs::File;
+use std::fs::{File, TempDir};
use std::io::prelude::*;
use std::path::{Path, PathBuf};
-use tempdir::TempDir;
use ssh2::{Session, MethodType, HashType};
diff --git a/tests/sftp.rs b/tests/sftp.rs
index c0940a5..774ba86 100644
--- a/tests/sftp.rs
+++ b/tests/sftp.rs
@@ -1,7 +1,5 @@
use std::io::prelude::*;
-use std::fs::{self, File};
-
-use tempdir::TempDir;
+use std::fs::{self, File, TempDir};
#[test]
fn smoke() {
diff --git a/tests/tempdir.rs b/tests/tempdir.rs
deleted file mode 100644
index 2f83e40..0000000
--- a/tests/tempdir.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use std::old_io;
-use std::io;
-use std::path;
-
-pub struct TempDir {
- inner: old_io::TempDir,
-}
-
-impl TempDir {
- pub fn new(prefix: &str) -> io::Result<TempDir> {
- Ok(TempDir { inner: old_io::TempDir::new(prefix).unwrap() })
- }
-
- pub fn path(&self) -> &path::Path {
- path::Path::new(self.inner.path().as_str().unwrap())
- }
-}