From 42c6255412751d3531ffe122d6f066bcac95fff9 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 26 Feb 2014 00:40:57 -0800
Subject: [PATCH] Updates for upstream changes

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

diff --git a/src/error.rs b/src/error.rs
index 5c4d5edd..11cdccd1 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,6 +1,7 @@
 //! Postgres errors
 
 use collections::HashMap;
+use std::from_str::FromStr;
 use std::io::IoError;
 
 use openssl::ssl::error::SslError;
diff --git a/src/lib.rs b/src/lib.rs
index 6f62029e..579d00f4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -81,6 +81,7 @@ use openssl::crypto::hash::{MD5, Hasher};
 use openssl::ssl::{SslStream, SslContext};
 use serialize::hex::ToHex;
 use std::cell::{Cell, RefCell};
+use std::from_str::FromStr;
 use std::io::{BufferedStream, IoResult};
 use std::io::net;
 use std::io::net::ip::{Port, SocketAddr};
diff --git a/src/stmt.rs b/src/stmt.rs
index 23540f90..02cde9ae 100644
--- a/src/stmt.rs
+++ b/src/stmt.rs
@@ -1,5 +1,6 @@
 use collections::{Deque, RingBuf};
 use std::cell::Cell;
+use std::from_str::FromStr;
 use std::task;
 
 use PostgresConnection;
diff --git a/src/test.rs b/src/test.rs
index afd1bc64..f757d2b7 100644
--- a/src/test.rs
+++ b/src/test.rs
@@ -1,9 +1,9 @@
 use collections::HashMap;
+use serialize::json;
 use sync::DuplexStream;
 use sync::Future;
 use time;
 use time::Timespec;
-use extra::json;
 use uuid::Uuid;
 use openssl::ssl::{SslContext, Sslv3};
 use std::f32;
diff --git a/src/types/mod.rs b/src/types/mod.rs
index e2349dda..6a741719 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -4,9 +4,9 @@
 extern crate extra;
 
 use collections::HashMap;
-use extra::json;
-use extra::json::Json;
 use uuid::Uuid;
+use serialize::json;
+use serialize::json::Json;
 use std::io::{MemWriter, BufReader};
 use std::io::util::LimitReader;
 use std::str;