From 0d788569383f65ff8df013e692ba3afbf5b7c084 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Mon, 24 Feb 2014 21:08:40 -0800
Subject: [PATCH] Update for ToStr removal

---
 src/error.rs            | 10 +++++-----
 submodules/rust-openssl |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/error.rs b/src/error.rs
index 06764416..5c4d5edd 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -9,7 +9,7 @@ use phf::PhfMap;
 macro_rules! make_errors(
     ($($code:expr => $error:ident),+) => (
         /// SQLSTATE error codes
-        #[deriving(ToStr, Eq, Clone, Show)]
+        #[deriving(Eq, Clone, Show)]
         #[allow(missing_doc)]
         pub enum PostgresSqlState {
             $($error,)+
@@ -352,7 +352,7 @@ make_errors!(
 )
 
 /// Reasons a new Postgres connection could fail
-#[deriving(ToStr)]
+#[deriving(Show)]
 pub enum PostgresConnectError {
     /// The provided URL could not be parsed
     InvalidUrl,
@@ -378,7 +378,7 @@ pub enum PostgresConnectError {
 }
 
 /// Represents the position of an error in a query
-#[deriving(ToStr, Show)]
+#[deriving(Show)]
 pub enum PostgresErrorPosition {
     /// A position in the original query
     Position(uint),
@@ -392,7 +392,7 @@ pub enum PostgresErrorPosition {
 }
 
 /// Encapsulates a Postgres error or notice.
-#[deriving(ToStr, Show)]
+#[deriving(Show)]
 pub struct PostgresDbError {
     /// The field contents are ERROR, FATAL, or PANIC (in an error message),
     /// or WARNING, NOTICE, DEBUG, INFO, or LOG (in a notice message), or a
@@ -496,7 +496,7 @@ impl PostgresDbError {
 }
 
 /// An error encountered when communicating with the Postgres server
-#[deriving(ToStr, Show)]
+#[deriving(Show)]
 pub enum PostgresError {
     /// An error reported by the Postgres server
     PgDbError(PostgresDbError),
diff --git a/submodules/rust-openssl b/submodules/rust-openssl
index 13e7cdbc..c3cf00ea 160000
--- a/submodules/rust-openssl
+++ b/submodules/rust-openssl
@@ -1 +1 @@
-Subproject commit 13e7cdbc4e95d6081e5839c6f4206eb44e37c56c
+Subproject commit c3cf00ea10efdc922dd7215575fd390c2bfe54c6