aboutsummaryrefslogtreecommitdiff
path: root/src/ssl/error.rs
diff options
context:
space:
mode:
authorChris Cole <[email protected]>2015-01-03 19:31:14 -0500
committerChris Cole <[email protected]>2015-01-03 19:31:14 -0500
commitfde7fbd03b0a92c2bf515c8f1fd3609b8b8745e6 (patch)
treed2d40563122545c4e24ac7ac387145e5e0886bf4 /src/ssl/error.rs
parentMerge branch 'master' of https://github.com/cjcole/rust-openssl (diff)
parentRelease v0.2.11 (diff)
downloadrust-openssl-fde7fbd03b0a92c2bf515c8f1fd3609b8b8745e6.tar.xz
rust-openssl-fde7fbd03b0a92c2bf515c8f1fd3609b8b8745e6.zip
Merge remote-tracking branch 'upstream/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 {