diff options
| author | Steven Fackler <[email protected]> | 2015-02-27 19:47:24 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-02-27 19:47:24 -0800 |
| commit | 2789764fe38a45df7ac0e0027b65a633b677a8a5 (patch) | |
| tree | d7b06f13f502fe5dad5b43f58462fb190fa01ff4 /openssl/src/ssl/error.rs | |
| parent | Silence stability warning (diff) | |
| parent | Convert to new IO. (diff) | |
| download | rust-openssl-2789764fe38a45df7ac0e0027b65a633b677a8a5.tar.xz rust-openssl-2789764fe38a45df7ac0e0027b65a633b677a8a5.zip | |
Merge branch 'breaks'
Conflicts:
openssl/src/lib.rs
Diffstat (limited to 'openssl/src/ssl/error.rs')
| -rw-r--r-- | openssl/src/ssl/error.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/src/ssl/error.rs b/openssl/src/ssl/error.rs index bb2a5557..81f38692 100644 --- a/openssl/src/ssl/error.rs +++ b/openssl/src/ssl/error.rs @@ -5,7 +5,7 @@ use libc::c_ulong; use std::error; use std::fmt; use std::ffi::CStr; -use std::old_io::IoError; +use std::io; use ffi; @@ -13,7 +13,7 @@ use ffi; #[derive(Debug, Clone, PartialEq, Eq)] pub enum SslError { /// The underlying stream reported an error - StreamError(IoError), + StreamError(io::Error), /// The SSL session has been closed by the other end SslSessionClosed, /// An error in the OpenSSL library |