diff options
| -rw-r--r-- | libssh2-sys/build.rs | 27 | ||||
| -rw-r--r-- | tests/all.rs | 6 | ||||
| -rw-r--r-- | tests/session.rs | 6 |
3 files changed, 20 insertions, 19 deletions
diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs index 6c10a06..461b8f1 100644 --- a/libssh2-sys/build.rs +++ b/libssh2-sys/build.rs @@ -1,8 +1,8 @@ -#![feature(io, path, os, core)] +#![feature(io, path, env, core)] extern crate "pkg-config" as pkg_config; -use std::os; +use std::env; use std::old_io::{self, fs, Command}; use std::old_io::process::InheritFd; use std::old_io::fs::PathExtensions; @@ -13,8 +13,8 @@ fn main() { Err(..) => {} } - let mut cflags = os::getenv("CFLAGS").unwrap_or(String::new()); - let target = os::getenv("TARGET").unwrap(); + let mut cflags = env::var_string("CFLAGS").unwrap_or(String::new()); + let target = env::var_string("TARGET").unwrap(); let windows = target.contains("windows") || target.contains("mingw"); cflags.push_str(" -ffunction-sections -fdata-sections"); @@ -27,16 +27,16 @@ fn main() { cflags.push_str(" -fPIC"); } - match os::getenv("DEP_OPENSSL_ROOT") { - Some(s) => { + match env::var_string("DEP_OPENSSL_ROOT") { + Ok(s) => { cflags.push_str(format!(" -I{}/include", s).as_slice()); cflags.push_str(format!(" -L{}/lib", s).as_slice()); } - None => {} + Err(..) => {} } - let src = Path::new(os::getenv("CARGO_MANIFEST_DIR").unwrap()); - let dst = Path::new(os::getenv("OUT_DIR").unwrap()); + let src = Path::new(env::var_string("CARGO_MANIFEST_DIR").unwrap()); + let dst = Path::new(env::var_string("OUT_DIR").unwrap()); let mut config_opts = Vec::new(); if windows { @@ -70,7 +70,7 @@ fn main() { .replace("C:\\", "/c/") .replace("\\", "/"))); run(Command::new(make()) - .arg(format!("-j{}", os::getenv("NUM_JOBS").unwrap())) + .arg(format!("-j{}", env::var_string("NUM_JOBS").unwrap())) .cwd(&dst.join("build/src"))); // Don't run `make install` because apparently it's a little buggy on mingw @@ -124,7 +124,8 @@ fn run(cmd: &mut Command) { } fn which(cmd: &str) -> Option<Path> { - let cmd = format!("{}{}", cmd, os::consts::EXE_SUFFIX); - let paths = os::split_paths(os::getenv("PATH").unwrap()); - paths.iter().map(|p| p.join(&cmd)).find(|p| p.exists()) + let cmd = format!("{}{}", cmd, env::consts::EXE_SUFFIX); + env::split_paths(&env::var("PATH").unwrap()).map(|p| { + p.join(&cmd) + }).find(|p| p.exists()) } diff --git a/tests/all.rs b/tests/all.rs index 66de542..46c1110 100644 --- a/tests/all.rs +++ b/tests/all.rs @@ -1,10 +1,10 @@ #![deny(warnings)] -#![feature(io, core, path, os, std_misc, libc)] +#![feature(io, core, path, std_misc, libc, env)] extern crate ssh2; extern crate libc; -use std::os; +use std::env; use std::old_io::TcpStream; mod agent; @@ -18,7 +18,7 @@ pub fn socket() -> TcpStream { } pub fn authed_session() -> (TcpStream, ssh2::Session) { - let user = os::getenv("USER").unwrap(); + let user = env::var_string("USER").unwrap(); let socket = socket(); let mut sess = ssh2::Session::new().unwrap(); sess.handshake(&socket).unwrap(); diff --git a/tests/session.rs b/tests/session.rs index 5814e55..480f761 100644 --- a/tests/session.rs +++ b/tests/session.rs @@ -1,4 +1,4 @@ -use std::os; +use std::env; use std::old_io::{self, File, TempDir}; use ssh2::{Session, MethodType, HashType}; @@ -23,7 +23,7 @@ fn smoke() { #[test] fn smoke_handshake() { - let user = os::getenv("USER").unwrap(); + let user = env::var_string("USER").unwrap(); let socket = ::socket(); let mut sess = Session::new().unwrap(); sess.handshake(&socket).unwrap(); @@ -55,7 +55,7 @@ fn scp_recv() { let (_tcp, sess) = ::authed_session(); let (mut ch, _) = sess.scp_recv(&Path::new(".ssh/authorized_keys")).unwrap(); let data = ch.read_to_string().unwrap(); - let p = Path::new(os::getenv("HOME").unwrap()).join(".ssh/authorized_keys"); + let p = Path::new(env::var_string("HOME").unwrap()).join(".ssh/authorized_keys"); let expected = File::open(&p).read_to_string().unwrap(); assert!(data == expected); } |