Updates for upstream changes

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;

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};

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;

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;

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;