From 24b876521b7023ad01de8952f796b73233681e13 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Thu, 2 Apr 2015 11:01:22 -0700
Subject: [PATCH] rustup: changes to io::Error

---
 openssl-sys/src/lib.rs   | 1 -
 openssl/src/bio/mod.rs   | 6 ++----
 openssl/src/lib.rs       | 2 +-
 openssl/src/ssl/error.rs | 2 +-
 openssl/src/ssl/mod.rs   | 4 ++--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index a5b36ae2..28db754a 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -1,7 +1,6 @@
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
 #![allow(dead_code)]
 #![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl-sys")]
-#![feature(convert)]
 
 extern crate libc;
 
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))
             }
         }
     }