diff options
| author | Steven Fackler <[email protected]> | 2015-03-10 19:38:44 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-03-10 19:38:44 -0700 |
| commit | a65b03c89e89ee2edba191040064f5d14e270c49 (patch) | |
| tree | 507005eb89d6e4d8bf0eb511be0e130a3eae9bef | |
| parent | Merge pull request #172 from reaperhulk/add-ssl-ctx-set-get-options (diff) | |
| download | rust-openssl-a65b03c89e89ee2edba191040064f5d14e270c49.tar.xz rust-openssl-a65b03c89e89ee2edba191040064f5d14e270c49.zip | |
Fix warnings
| -rw-r--r-- | openssl-sys/src/lib.rs | 2 | ||||
| -rw-r--r-- | openssl/src/crypto/memcmp.rs | 2 | ||||
| -rw-r--r-- | openssl/src/lib.rs | 4 | ||||
| -rw-r--r-- | openssl/src/ssl/mod.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 5c937d29..24b79d36 100644 --- 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 index 299effa9..cf08bdb5 100644 --- 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 index bfebc2f8..566151d1 100644 --- 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 index a26c0578..d19f6678 100644 --- 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!() } |