Fix for nightly changes

Author: sfackler

src/lib.rs

@@ -518,19 +518,19 @@ impl InnerConnection {
     fn prepare_copy_in<'a>(&mut self, table: &str, rows: &[&str], conn: &'a Connection)
                            -> Result<CopyInStatement<'a>> {
         let mut query = vec![];
-        let _ = write!(query, "SELECT ");
+        let _ = write!(&mut query, "SELECT ");
         let _ = util::comma_join(&mut query, rows.iter().map(|&e| e));
-        let _ = write!(query, " FROM {}", table);
+        let _ = write!(&mut query, " FROM {}", table);
         let query = String::from_utf8(query).unwrap();
         let (stmt_name, _, result_desc) = try!(self.raw_prepare(query[]));
 
         let column_types = result_desc.iter().map(|desc| desc.ty.clone()).collect();
         try!(self.close_statement(stmt_name[]));
 
         let mut query = vec![];
-        let _ = write!(query, "COPY {} (", table);
+        let _ = write!(&mut query, "COPY {} (", table);
         let _ = util::comma_join(&mut query, rows.iter().map(|&e| e));
-        let _ = write!(query, ") FROM STDIN WITH (FORMAT binary)");
+        let _ = write!(&mut query, ") FROM STDIN WITH (FORMAT binary)");
         let query = String::from_utf8(query).unwrap();
         let (stmt_name, _, _) = try!(self.raw_prepare(query[]));
 

tests/types/mod.rs

@@ -2,6 +2,7 @@ use serialize::json;
 use std::collections::HashMap;
 use std::f32;
 use std::f64;
+use std::fmt;
 use std::num::Float;
 
 use postgres::{Connection, SslMode};
@@ -53,10 +54,10 @@ mod uuid;
 #[cfg(feature = "time")]
 mod time;
 
-fn test_type<T: PartialEq+FromSql+ToSql, S: Str>(sql_type: &str, checks: &[(T, S)]) {
+fn test_type<T: PartialEq+FromSql+ToSql, S: fmt::Show>(sql_type: &str, checks: &[(T, S)]) {
     let conn = or_panic!(Connection::connect("postgres://postgres@localhost", &SslMode::None));
     for &(ref val, ref repr) in checks.iter() {
-        let stmt = or_panic!(conn.prepare(format!("SELECT {:s}::{}", *repr, sql_type)[]));
+        let stmt = or_panic!(conn.prepare(format!("SELECT {}::{}", *repr, sql_type)[]));
         let result = or_panic!(stmt.query(&[])).next().unwrap().get(0u);
         assert!(val == &result);