aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-04-02 11:12:32 -0700
committerSteven Fackler <[email protected]>2015-04-02 11:12:32 -0700
commit22c5f047c1aa460ae02787a7696c36feeb8b368e (patch)
treef0809d652b4b5a5c83a18d69a18c58b8faaeb364 /openssl/src/ssl
parentRemove a bunch of use of core feature (diff)
parentrustup: changes to io::Error (diff)
downloadrust-openssl-22c5f047c1aa460ae02787a7696c36feeb8b368e.tar.xz
rust-openssl-22c5f047c1aa460ae02787a7696c36feeb8b368e.zip
Merge pull request #193 from seanmonstar/rustup
rustup: changes to io::Error
Diffstat (limited to 'openssl/src/ssl')
-rw-r--r--openssl/src/ssl/error.rs2
-rw-r--r--openssl/src/ssl/mod.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/openssl/src/ssl/error.rs b/openssl/src/ssl/error.rs
index 91aad549..9ff6cae9 100644
--- a/openssl/src/ssl/error.rs
+++ b/openssl/src/ssl/error.rs
@@ -10,7 +10,7 @@ use std::io;
use ffi;
/// An SSL error
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug)]
pub enum SslError {
/// The underlying stream reported an error
StreamError(io::Error),
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index edd4daae..9f63ac4d 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -808,7 +808,7 @@ impl<S: Read+Write> Read for SslStream<S> {
Err(SslSessionClosed) => Ok(0),
Err(StreamError(e)) => Err(e),
Err(e @ OpenSslErrors(_)) => {
- Err(io::Error::new(io::ErrorKind::Other, "OpenSSL error", Some(format!("{}", e))))
+ Err(io::Error::new(io::ErrorKind::Other, e))
}
}
}
@@ -821,7 +821,7 @@ impl<S: Read+Write> Write for SslStream<S> {
Err(SslSessionClosed) => Ok(0),
Err(StreamError(e)) => return Err(e),
Err(e @ OpenSslErrors(_)) => {
- Err(io::Error::new(io::ErrorKind::Other, "OpenSSL error", Some(format!("{}", e))))
+ Err(io::Error::new(io::ErrorKind::Other, e))
}
}
}