From e7a2ee8bd8f88022ee06fbafc0d8467b0af134a6 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Thu, 6 Feb 2014 21:37:05 -0800
Subject: [PATCH] More updates for upstream changes

---
 src/lib.rs              |  1 +
 src/pool.rs             | 20 +++++++++-----------
 src/tests.rs            |  4 ++--
 submodules/rust-openssl |  2 +-
 submodules/rust-phf     |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 2820562c..57235518 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -66,6 +66,7 @@ fn main() {
 
 extern mod extra;
 extern mod openssl;
+extern mod sync;
 #[phase(syntax)]
 extern mod phf_mac;
 extern mod phf;
diff --git a/src/pool.rs b/src/pool.rs
index 7f1e7881..d4f98d84 100644
--- a/src/pool.rs
+++ b/src/pool.rs
@@ -1,17 +1,15 @@
 //! A simple connection pool
 
-extern mod extra;
+use sync::MutexArc;
 
-use extra::arc::MutexArc;
-
-use super::{PostgresNotifications,
-            PostgresCancelData,
-            PostgresConnection,
-            NormalPostgresStatement,
-            PostgresTransaction,
-            SslMode};
-use super::error::{PostgresConnectError, PostgresError};
-use super::types::ToSql;
+use {PostgresNotifications,
+     PostgresCancelData,
+     PostgresConnection,
+     NormalPostgresStatement,
+     PostgresTransaction,
+     SslMode};
+use error::{PostgresConnectError, PostgresError};
+use types::ToSql;
 
 struct InnerConnectionPool {
     url: ~str,
diff --git a/src/tests.rs b/src/tests.rs
index 1af3d7b9..b4ce8a4b 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -1,5 +1,5 @@
-use extra::comm::DuplexStream;
-use extra::future::Future;
+use sync::DuplexStream;
+use sync::Future;
 use extra::time;
 use extra::time::Timespec;
 use extra::json;
diff --git a/submodules/rust-openssl b/submodules/rust-openssl
index 1a5e625b..490e518c 160000
--- a/submodules/rust-openssl
+++ b/submodules/rust-openssl
@@ -1 +1 @@
-Subproject commit 1a5e625b4f21c9b4870ef30ab1da3c1fed919672
+Subproject commit 490e518c6d24cd5418bbe5a2b7b0dec9c0d0bef4
diff --git a/submodules/rust-phf b/submodules/rust-phf
index 11b6c728..16947cf7 160000
--- a/submodules/rust-phf
+++ b/submodules/rust-phf
@@ -1 +1 @@
-Subproject commit 11b6c72846216773a018de4dbd1f8fe9f7260208
+Subproject commit 16947cf75b2f49de80c86efb070e988a935cc1e7