From 9b81b556a10ddb7815be46afcf668af34c5f0410 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 23 Feb 2014 22:32:14 -0800
Subject: [PATCH] Update for hashmap move

---
 src/error.rs        | 2 +-
 src/lib.rs          | 3 +--
 src/test.rs         | 2 +-
 src/types/mod.rs    | 4 ++--
 submodules/rust-phf | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/error.rs b/src/error.rs
index 8256ba86..06764416 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,6 +1,6 @@
 //! Postgres errors
 
-use std::hashmap::HashMap;
+use collections::HashMap;
 use std::io::IoError;
 
 use openssl::ssl::error::SslError;
diff --git a/src/lib.rs b/src/lib.rs
index 4923e973..6f62029e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -75,13 +75,12 @@ extern crate phf_mac;
 extern crate phf;
 extern crate uuid;
 
-use collections::{Deque, RingBuf};
+use collections::{Deque, HashMap, RingBuf};
 use extra::url::{UserInfo, Url};
 use openssl::crypto::hash::{MD5, Hasher};
 use openssl::ssl::{SslStream, SslContext};
 use serialize::hex::ToHex;
 use std::cell::{Cell, RefCell};
-use std::hashmap::HashMap;
 use std::io::{BufferedStream, IoResult};
 use std::io::net;
 use std::io::net::ip::{Port, SocketAddr};
diff --git a/src/test.rs b/src/test.rs
index 19907746..afd1bc64 100644
--- a/src/test.rs
+++ b/src/test.rs
@@ -1,3 +1,4 @@
+use collections::HashMap;
 use sync::DuplexStream;
 use sync::Future;
 use time;
@@ -7,7 +8,6 @@ use uuid::Uuid;
 use openssl::ssl::{SslContext, Sslv3};
 use std::f32;
 use std::f64;
-use std::hashmap::HashMap;
 use std::io::timer;
 
 use {PostgresNoticeHandler,
diff --git a/src/types/mod.rs b/src/types/mod.rs
index 542d2cc6..e2349dda 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -3,15 +3,15 @@
 
 extern crate extra;
 
-use time::Timespec;
+use collections::HashMap;
 use extra::json;
 use extra::json::Json;
 use uuid::Uuid;
-use std::hashmap::HashMap;
 use std::io::{MemWriter, BufReader};
 use std::io::util::LimitReader;
 use std::str;
 use std::vec;
+use time::Timespec;
 
 use self::array::{Array, ArrayBase, DimensionInfo};
 use self::range::{RangeBound, Inclusive, Exclusive, Range};
diff --git a/submodules/rust-phf b/submodules/rust-phf
index b3b63d2e..340c9342 160000
--- a/submodules/rust-phf
+++ b/submodules/rust-phf
@@ -1 +1 @@
-Subproject commit b3b63d2e1976419e94b0757aeb667fae22580e3e
+Subproject commit 340c9342c224cd3a2f30ba1e4416c0ef632cb0b3