Fix warnings

c0ding · Mar 11, 2015 · a65b03c · a65b03c
1 parent 8b8736f
commit a65b03c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
@@ -1,6 +1,6 @@
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
 #![allow(dead_code)]
-#![feature(path, fs)]
+#![feature(path, path_ext)]
 #![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl-sys")]
 
 extern crate libc;

diff --git a/openssl/src/crypto/memcmp.rs b/openssl/src/crypto/memcmp.rs
@@ -32,7 +32,7 @@ mod tests {
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_diff_lens() {
         eq(&[], &[1]);
     }

diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
@@ -1,5 +1,5 @@
-#![feature(unsafe_destructor, core, io, std_misc, net, path, os, unique)]
-#![cfg_attr(test, feature(net, fs))]
+#![feature(unsafe_destructor, core, io, std_misc, net, path, unique)]
+#![cfg_attr(test, feature(net))]
 #![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl")]
 
 #[macro_use]

diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
@@ -432,7 +432,7 @@ impl Ssl {
 
     fn get_error(&self, ret: c_int) -> LibSslError {
         let err = unsafe { ffi::SSL_get_error(*self.ssl, ret) };
-        match FromPrimitive::from_int(err as isize) {
+        match FromPrimitive::from_isize(err as isize) {
             Some(err) => err,
             None => unreachable!()
         }