Skip to content

Commit

Permalink
Remove usage of unstable features in openssl-sys
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton committed Mar 16, 2015
1 parent a65b03c commit 2560ccb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
2 changes: 0 additions & 2 deletions openssl-sys/build.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(path)]

extern crate "pkg-config" as pkg_config;
extern crate gcc;

Expand Down
1 change: 0 additions & 1 deletion openssl-sys/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![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;
Expand Down
6 changes: 3 additions & 3 deletions openssl-sys/src/probe.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::env;
use std::fs::PathExt;
use std::fs;
use std::path::PathBuf;

pub struct ProbeResult {
Expand All @@ -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()
}

Expand Down Expand Up @@ -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);
}
}

0 comments on commit 2560ccb

Please sign in to comment.