More updates for upstream changes

This commit is contained in:
Steven Fackler 2014-02-06 21:37:05 -08:00
parent fdd1f4f88d
commit e7a2ee8bd8
5 changed files with 14 additions and 15 deletions

View File

@ -66,6 +66,7 @@ fn main() {
extern mod extra; extern mod extra;
extern mod openssl; extern mod openssl;
extern mod sync;
#[phase(syntax)] #[phase(syntax)]
extern mod phf_mac; extern mod phf_mac;
extern mod phf; extern mod phf;

View File

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

View File

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

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

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