From 5a80cc8aaebb324622de6b7f3ac974fd44fbdf2e Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 25 Mar 2015 10:51:28 -0700
Subject: Update to rust master

---
 openssl-sys/src/lib.rs   | 3 ++-
 openssl-sys/src/probe.rs | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'openssl-sys/src')

diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 59f11b65..a5b36ae2 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -1,11 +1,12 @@
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
 #![allow(dead_code)]
 #![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl-sys")]
+#![feature(convert)]
 
 extern crate libc;
 
 #[cfg(target_os = "nacl")]
-extern crate "libressl-pnacl-sys" as _for_linkage;
+extern crate libressl_pnacl_sys;
 
 use libc::{c_void, c_int, c_char, c_ulong, c_long, c_uint, c_uchar, size_t};
 use std::mem;
diff --git a/openssl-sys/src/probe.rs b/openssl-sys/src/probe.rs
index bbf769f4..6a67e478 100644
--- a/openssl-sys/src/probe.rs
+++ b/openssl-sys/src/probe.rs
@@ -24,7 +24,7 @@ pub fn find_certs_dirs() -> Vec<PathBuf> {
         "/etc/openssl",
         "/etc/pki/tls",
         "/etc/ssl",
-    ].iter().map(|s| PathBuf::new(*s)).filter(|p| {
+    ].iter().map(|s| PathBuf::from(*s)).filter(|p| {
         fs::metadata(p).is_ok()
     }).collect()
 }
@@ -51,8 +51,8 @@ pub fn init_ssl_cert_env_vars() {
 
 pub fn probe() -> ProbeResult {
     let mut result = ProbeResult {
-        cert_file: env::var_os("SSL_CERT_FILE").map(|s| PathBuf::new(&s)),
-        cert_dir: env::var_os("SSL_CERT_DIR").map(|s| PathBuf::new(&s)),
+        cert_file: env::var_os("SSL_CERT_FILE").map(PathBuf::from),
+        cert_dir: env::var_os("SSL_CERT_DIR").map(PathBuf::from),
     };
     for certs_dir in find_certs_dirs().iter() {
         // cert.pem looks to be an openssl 1.0.1 thing, while
-- 
cgit v1.2.3