diff --git a/src/lib.rs b/src/lib.rs index ce41a231..3d8db502 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -67,7 +67,6 @@ fn main() { extern crate collections; extern crate openssl; extern crate serialize; -extern crate sync; extern crate time; extern crate phf; #[phase(plugin)] diff --git a/src/pool.rs b/src/pool.rs index e388d269..efd3187d 100644 --- a/src/pool.rs +++ b/src/pool.rs @@ -1,6 +1,6 @@ //! A simple connection pool -use sync::{Arc, Mutex}; +use std::sync::{Arc, Mutex}; use {PostgresNotifications, PostgresConnectParams, diff --git a/src/test.rs b/src/test.rs index f39b6a69..e6c47af8 100644 --- a/src/test.rs +++ b/src/test.rs @@ -1,6 +1,6 @@ use serialize::json; -use sync; -use sync::Future; +use std::comm; +use std::sync::Future; use time; use time::Timespec; use uuid::Uuid; @@ -54,7 +54,7 @@ fn test_pool() { let pool = or_fail!(PostgresConnectionPool::new("postgres://postgres@localhost", NoSsl, 2)); - let (stream1, stream2) = sync::duplex(); + let (stream1, stream2) = comm::duplex(); let pool1 = pool.clone(); let mut fut1 = Future::spawn(proc() { diff --git a/submodules/rust-openssl b/submodules/rust-openssl index d9972109..d766671b 160000 --- a/submodules/rust-openssl +++ b/submodules/rust-openssl @@ -1 +1 @@ -Subproject commit d997210911a18cf9048afe195b701462c17989cb +Subproject commit d766671bda3777690ef71739bbdd29382d56a7bc