Update to rust master

3 files changed, 9 insertions, 9 deletions

diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs
index 461b8f1..1da101c 100644
--- a/libssh2-sys/build.rs
+++ b/libssh2-sys/build.rs
@@ -13,8 +13,8 @@ fn main() {
         Err(..) => {}
     }
 
-    let mut cflags = env::var_string("CFLAGS").unwrap_or(String::new());
-    let target = env::var_string("TARGET").unwrap();
+    let mut cflags = env::var("CFLAGS").unwrap_or(String::new());
+    let target = env::var("TARGET").unwrap();
     let windows = target.contains("windows") || target.contains("mingw");
     cflags.push_str(" -ffunction-sections -fdata-sections");
 
@@ -27,7 +27,7 @@ fn main() {
         cflags.push_str(" -fPIC");
     }
 
-    match env::var_string("DEP_OPENSSL_ROOT") {
+    match env::var("DEP_OPENSSL_ROOT") {
         Ok(s) => {
             cflags.push_str(format!(" -I{}/include", s).as_slice());
             cflags.push_str(format!(" -L{}/lib", s).as_slice());
@@ -35,8 +35,8 @@ fn main() {
         Err(..) => {}
     }
 
-    let src = Path::new(env::var_string("CARGO_MANIFEST_DIR").unwrap());
-    let dst = Path::new(env::var_string("OUT_DIR").unwrap());
+    let src = Path::new(env::var("CARGO_MANIFEST_DIR").unwrap());
+    let dst = Path::new(env::var("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{}", env::var_string("NUM_JOBS").unwrap()))
+                .arg(format!("-j{}", env::var("NUM_JOBS").unwrap()))
                 .cwd(&dst.join("build/src")));
 
     // Don't run `make install` because apparently it's a little buggy on mingw
diff --git a/tests/all.rs b/tests/all.rs
index 46c1110..749e976 100644
--- a/tests/all.rs
+++ b/tests/all.rs
@@ -18,7 +18,7 @@ pub fn socket() -> TcpStream {
 }
 
 pub fn authed_session() -> (TcpStream, ssh2::Session) {
-    let user = env::var_string("USER").unwrap();
+    let user = env::var("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 480f761..8a97710 100644
--- a/tests/session.rs
+++ b/tests/session.rs
@@ -23,7 +23,7 @@ fn smoke() {
 
 #[test]
 fn smoke_handshake() {
-    let user = env::var_string("USER").unwrap();
+    let user = env::var("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(env::var_string("HOME").unwrap()).join(".ssh/authorized_keys");
+    let p = Path::new(env::var("HOME").unwrap()).join(".ssh/authorized_keys");
     let expected = File::open(&p).read_to_string().unwrap();
     assert!(data == expected);
 }