Update for upstream changes

This commit is contained in:
Steven Fackler 2014-06-12 19:35:59 -07:00
parent ed81ceadf2
commit 8e34fe3586
4 changed files with 5 additions and 6 deletions

View File

@ -67,7 +67,6 @@ fn main() {
extern crate collections; extern crate collections;
extern crate openssl; extern crate openssl;
extern crate serialize; extern crate serialize;
extern crate sync;
extern crate time; extern crate time;
extern crate phf; extern crate phf;
#[phase(plugin)] #[phase(plugin)]

View File

@ -1,6 +1,6 @@
//! A simple connection pool //! A simple connection pool
use sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use {PostgresNotifications, use {PostgresNotifications,
PostgresConnectParams, PostgresConnectParams,

View File

@ -1,6 +1,6 @@
use serialize::json; use serialize::json;
use sync; use std::comm;
use sync::Future; use std::sync::Future;
use time; use time;
use time::Timespec; use time::Timespec;
use uuid::Uuid; use uuid::Uuid;
@ -54,7 +54,7 @@ fn test_pool() {
let pool = or_fail!(PostgresConnectionPool::new("postgres://postgres@localhost", let pool = or_fail!(PostgresConnectionPool::new("postgres://postgres@localhost",
NoSsl, 2)); NoSsl, 2));
let (stream1, stream2) = sync::duplex(); let (stream1, stream2) = comm::duplex();
let pool1 = pool.clone(); let pool1 = pool.clone();
let mut fut1 = Future::spawn(proc() { let mut fut1 = Future::spawn(proc() {

@ -1 +1 @@
Subproject commit d997210911a18cf9048afe195b701462c17989cb Subproject commit d766671bda3777690ef71739bbdd29382d56a7bc