Merge pull request #160 from globin/fix/rustup

rustup to current master

1 files changed, 4 insertions, 4 deletions

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