More updates for upstream changes

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;

src/pool.rs

@@ -1,17 +1,15 @@
 //! A simple connection pool
 
-extern mod extra;
+use sync::MutexArc;
 
-use extra::arc::MutexArc;
+use {PostgresNotifications,
-
+     PostgresCancelData,
-use super::{PostgresNotifications,
+     PostgresConnection,
-            PostgresCancelData,
+     NormalPostgresStatement,
-            PostgresConnection,
+     PostgresTransaction,
-            NormalPostgresStatement,
+     SslMode};
-            PostgresTransaction,
+use error::{PostgresConnectError, PostgresError};
-            SslMode};
+use types::ToSql;
-use super::error::{PostgresConnectError, PostgresError};
-use super::types::ToSql;
 
 struct InnerConnectionPool {
     url: ~str,

src/tests.rs

@@ -1,5 +1,5 @@
-use extra::comm::DuplexStream;
+use sync::DuplexStream;
-use extra::future::Future;
+use sync::Future;
 use extra::time;
 use extra::time::Timespec;
 use extra::json;

submodules/rust-openssl

@@ -1 +1 @@
-Subproject commit 1a5e625b4f21c9b4870ef30ab1da3c1fed919672
+Subproject commit 490e518c6d24cd5418bbe5a2b7b0dec9c0d0bef4

submodules/rust-phf

@@ -1 +1 @@
-Subproject commit 11b6c72846216773a018de4dbd1f8fe9f7260208
+Subproject commit 16947cf75b2f49de80c86efb070e988a935cc1e7