rustup to current master

2 files changed, 7 insertions, 7 deletions

diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs
index 37048f03..29e70ccb 100644
--- a/openssl-sys/build.rs
+++ b/openssl-sys/build.rs
@@ -7,10 +7,10 @@ use std::env;
 use std::default::Default;
 
 fn main() {
-    let target = env::var_string("TARGET").unwrap();
+    let target = env::var("TARGET").unwrap();
 
     if target.contains("android") {
-        let path = env::var_string("OPENSSL_PATH").ok()
+        let path = env::var("OPENSSL_PATH").ok()
             .expect("Android does not provide openssl libraries, please build them yourself \
                      (instructions in the README) and provide their location through \
                      $OPENSSL_PATH.");
@@ -56,6 +56,6 @@ fn build_old_openssl_shim(is_old: bool) {
             &config,
             &["src/old_openssl_shim.c"]);
 
-    let out_dir = env::var_string("OUT_DIR").unwrap();
+    let out_dir = env::var("OUT_DIR").unwrap();
     println!("cargo:rustc-flags=-L native={} -l old_openssl_shim:static", out_dir);
 }
diff --git a/openssl-sys/src/probe.rs b/openssl-sys/src/probe.rs
index 7896b3e9..dcbefb6d 100644
--- a/openssl-sys/src/probe.rs
+++ b/openssl-sys/src/probe.rs
@@ -42,16 +42,16 @@ pub fn init_ssl_cert_env_vars() {
     fn put(var: &str, path: Path) {
         // Don't stomp over what anyone else has set
         match env::var(var) {
-            Some(..) => {}
-            None => env::set_var(var, &path),
+            Ok(..) => {}
+            Err(..) => env::set_var(var, &path),
         }
     }
 }
 
 pub fn probe() -> ProbeResult {
     let mut result = ProbeResult {
-        cert_file: env::var_string("SSL_CERT_FILE").ok().map(Path::new),
-        cert_dir: env::var_string("SSL_CERT_DIR").ok().map(Path::new),
+        cert_file: env::var("SSL_CERT_FILE").ok().map(Path::new),
+        cert_dir: env::var("SSL_CERT_DIR").ok().map(Path::new),
     };
     for certs_dir in find_certs_dirs().iter() {
         // cert.pem looks to be an openssl 1.0.1 thing, while