Commit 5adbe4b3 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #184 from alexcrichton/update 

Remove usage of unstable features in openssl-sys
parents a65b03c8 2560ccb3

openssl-sys/build.rs

+0 −2
Original line number Diff line number Diff line 
#![feature(path)]



extern crate "pkg-config" as pkg_config;

extern crate gcc;

openssl-sys/src/lib.rs

+0 −1
Original line number Diff line number Diff line 
#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]

#![allow(dead_code)]

#![feature(path, path_ext)]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl-sys")]



extern crate libc;

openssl-sys/src/probe.rs

+3 −3
Original line number Diff line number Diff line 
use std::env;

use std::fs::PathExt;

use std::fs;

use std::path::PathBuf;



pub struct ProbeResult {
@@ -25,7 +25,7 @@ pub fn find_certs_dirs() -> Vec<PathBuf> { 
        "/etc/pki/tls",

        "/etc/ssl",

    ].iter().map(|s| PathBuf::new(*s)).filter(|p| {

        p.exists()

        fs::metadata(p).is_ok()

    }).collect()

}
@@ -67,7 +67,7 @@ pub fn probe() -> ProbeResult { 
}



fn try(dst: &mut Option<PathBuf>, val: PathBuf) {

    if dst.is_none() && val.exists() {

    if dst.is_none() && fs::metadata(&val).is_ok() {

        *dst = Some(val);

    }

}