aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/bio/mod.rs6
-rw-r--r--openssl/src/lib.rs2
-rw-r--r--openssl/src/ssl/error.rs2
-rw-r--r--openssl/src/ssl/mod.rs4
4 files changed, 6 insertions, 8 deletions
diff --git a/openssl/src/bio/mod.rs b/openssl/src/bio/mod.rs
index ca944adb..ad2f65c2 100644
--- a/openssl/src/bio/mod.rs
+++ b/openssl/src/bio/mod.rs
@@ -71,8 +71,7 @@ impl Read for MemBio {
Ok(0)
} else {
Err(io::Error::new(io::ErrorKind::Other,
- "MemBio read error",
- Some(format!("{:?}", SslError::get()))))
+ SslError::get()))
}
} else {
Ok(ret as usize)
@@ -89,8 +88,7 @@ impl Write for MemBio {
if ret < 0 {
Err(io::Error::new(io::ErrorKind::Other,
- "MemBio write error",
- Some(format!("{:?}", SslError::get()))))
+ SslError::get()))
} else {
Ok(ret as usize)
}
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 38314723..a7136cf5 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(core, io, std_misc, unique, collections)]
+#![feature(core, std_misc, unique)]
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl")]
#[macro_use]
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))
}
}
}