aboutsummaryrefslogtreecommitdiff
path: root/src/ssl/error.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-01-03 11:09:21 -0500
committerSteven Fackler <[email protected]>2015-01-03 11:09:21 -0500
commit9042a4db2fbd37255576ec36a3d9aea644ee7b2a (patch)
tree7d7d52e3e7542c7cea656ea69e7a05d10c4ab7b4 /src/ssl/error.rs
parentMerge pull request #134 from DiamondLovesYou/master (diff)
parentUpdated to master: (diff)
downloadrust-openssl-9042a4db2fbd37255576ec36a3d9aea644ee7b2a.tar.xz
rust-openssl-9042a4db2fbd37255576ec36a3d9aea644ee7b2a.zip
Merge pull request #136 from vhbit/up-master
Updated to master:
Diffstat (limited to 'src/ssl/error.rs')
-rw-r--r--src/ssl/error.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ssl/error.rs b/src/ssl/error.rs
index 7e8daef1..888a9cdc 100644
--- a/src/ssl/error.rs
+++ b/src/ssl/error.rs
@@ -9,7 +9,7 @@ use std::c_str::CString;
use ffi;
/// An SSL error
-#[deriving(Show, Clone, PartialEq, Eq)]
+#[derive(Show, Clone, PartialEq, Eq)]
pub enum SslError {
/// The underlying stream reported an error
StreamError(IoError),
@@ -37,7 +37,7 @@ impl error::Error for SslError {
}
/// An error from the OpenSSL library
-#[deriving(Show, Clone, PartialEq, Eq)]
+#[derive(Show, Clone, PartialEq, Eq)]
pub enum OpensslError {
/// An unknown error
UnknownError {