aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/lib.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-02-27 19:47:24 -0800
committerSteven Fackler <[email protected]>2015-02-27 19:47:24 -0800
commit2789764fe38a45df7ac0e0027b65a633b677a8a5 (patch)
treed7b06f13f502fe5dad5b43f58462fb190fa01ff4 /openssl/src/lib.rs
parentSilence stability warning (diff)
parentConvert to new IO. (diff)
downloadrust-openssl-2789764fe38a45df7ac0e0027b65a633b677a8a5.tar.xz
rust-openssl-2789764fe38a45df7ac0e0027b65a633b677a8a5.zip
Merge branch 'breaks'
Conflicts: openssl/src/lib.rs
Diffstat (limited to 'openssl/src/lib.rs')
-rw-r--r--openssl/src/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 751cc3fc..12b0a887 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -1,4 +1,5 @@
-#![feature(unsafe_destructor, core, old_io, std_misc, libc, old_path, unique)]
+#![feature(unsafe_destructor, core, io, std_misc, path, os, unique)]
+#![cfg_attr(test, feature(net, fs))]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl")]
extern crate libc;