Fixes for new master

Author: sfackler

src/pool/test.rs

@@ -1,9 +1,8 @@
 extern mod extra;
 extern mod postgres;
 
-use std::cell::Cell;
 use extra::comm::DuplexStream;
-use extra::future;
+use extra::future::Future;
 
 use postgres::pool::PostgresConnectionPool;
 
@@ -14,19 +13,13 @@ fn test_pool() {
 
     let (stream1, stream2) = DuplexStream::<(), ()>();
 
-    let pool1 = Cell::new(pool.clone());
-    let mut fut1 = do future::spawn {
-        let pool = pool1.take();
-
+    let mut fut1 = do Future::spawn_with(pool.clone()) |pool| {
         let _conn = pool.get_connection();
         stream1.send(());
         stream1.recv();
     };
 
-    let pool2 = Cell::new(pool.clone());
-    let mut fut2 = do future::spawn {
-        let pool = pool2.take();
-
+    let mut fut2 = do Future::spawn_with(pool.clone()) |pool| {
         let _conn = pool.get_connection();
         stream2.send(());
         stream2.recv();

src/test.rs

@@ -282,11 +282,11 @@ fn test_tm_params() {
 
 fn test_nan_param<T: Float+ToSql+FromSql>(sql_type: &str) {
     let conn = PostgresConnection::connect("postgres://postgres@localhost");
-    let nan: T = Float::NaN();
+    let nan: T = Float::nan();
     let stmt = conn.prepare("SELECT $1::" + sql_type);
     let mut result = stmt.query([&nan as &ToSql]);
     let val: T = result.next().unwrap()[0];
-    assert!(val.is_NaN())
+    assert!(val.is_nan())
 }
 
 #[test]