From cdfcef8e05da71ce8a7ce7515a90f40679ef82a7 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Mon, 15 Dec 2014 12:39:49 -0800
Subject: [PATCH] Update for upstream changes

---
 Cargo.toml    | 4 ++--
 tests/test.rs | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 401f8ad0..4575e6e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,8 +23,8 @@ path = "tests/test.rs"
 default = ["uuid"]
 
 [dependencies]
-phf = "0.2"
-phf_mac = "0.2"
+phf = "0.3"
+phf_mac = "0.3"
 openssl = "0.2.1"
 time = "0.1"
 log = "0.1"
diff --git a/tests/test.rs b/tests/test.rs
index 9220ee9d..795dc04c 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -623,7 +623,7 @@ fn test_notifications_next_block() {
     let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
     or_panic!(conn.execute("LISTEN test_notifications_next_block", &[]));
 
-    spawn(proc() {
+    spawn(|| {
         let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
         timer::sleep(Duration::milliseconds(500));
         or_panic!(conn.execute("NOTIFY test_notifications_next_block, 'foo'", &[]));
@@ -642,7 +642,7 @@ fn test_notifications_next_block_for() {
     let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
     or_panic!(conn.execute("LISTEN test_notifications_next_block_for", &[]));
 
-    spawn(proc() {
+    spawn(|| {
         let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
         timer::sleep(Duration::milliseconds(500));
         or_panic!(conn.execute("NOTIFY test_notifications_next_block_for, 'foo'", &[]));
@@ -661,7 +661,7 @@ fn test_notifications_next_block_for_timeout() {
     let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
     or_panic!(conn.execute("LISTEN test_notifications_next_block_for_timeout", &[]));
 
-    spawn(proc() {
+    spawn(|| {
         let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
         timer::sleep(Duration::seconds(2));
         or_panic!(conn.execute("NOTIFY test_notifications_next_block_for_timeout, 'foo'", &[]));
@@ -683,7 +683,7 @@ fn test_cancel_query() {
     let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
     let cancel_data = conn.cancel_data();
 
-    spawn(proc() {
+    spawn(move || {
         timer::sleep(Duration::milliseconds(500));
         assert!(postgres::cancel_query("postgres://postgres@localhost", &SslMode::None,
                                        cancel_data).is_ok());