Update for upstream changes

String vs Show still needs to be resolved, but it compiles now

Author: sfackler

Cargo.toml

@@ -35,5 +35,5 @@ optional = true
 version = "0.1"
 
 [dev-dependencies]
-url = "0.2"
+#url = "0.2"
 

src/error.rs

@@ -444,9 +444,9 @@ impl fmt::Show for ConnectError {
             ConnectError::NoSslSupport =>
                 write!(fmt, "The server does not support SSL"),
             ConnectError::SslError(ref err) =>
-                write!(fmt, "Error initiating SSL session: {}", err),
+                write!(fmt, "Error initiating SSL session: {:?}", err),
             ConnectError::IoError(ref err) =>
-                write!(fmt, "Error communicating with server: {}", err),
+                write!(fmt, "Error communicating with server: {:?}", err),
             ConnectError::BadResponse =>
                 write!(fmt, "The server returned an unexpected response"),
         }
@@ -457,11 +457,11 @@ impl fmt::Show for ConnectError {
 #[derive(Clone, PartialEq, Eq)]
 pub enum ErrorPosition {
     /// A position in the original query
-    Normal(uint),
+    Normal(usize),
     /// A position in an internally generated query
     Internal {
         /// The byte position
-        position: uint,
+        position: usize,
         /// A query generated by the Postgres server
         query: String
     }
@@ -518,7 +518,7 @@ pub struct DbError {
     pub file: String,
     /// The line number of the source-code location where the error was
     /// reported.
-    pub line: uint,
+    pub line: usize,
     /// The name of the source-code routine reporting the error.
     pub routine: String
 }
@@ -603,9 +603,9 @@ pub enum Error {
     /// An incorrect number of parameters were bound to a statement
     WrongParamCount {
         /// The expected number of parameters
-        expected: uint,
+        expected: usize,
         /// The actual number of parameters
-        actual: uint,
+        actual: usize,
     },
     /// An attempt was made to convert between incompatible Rust and Postgres
     /// types

src/io.rs

@@ -35,7 +35,7 @@ pub enum InternalStream {
 }
 
 impl Reader for InternalStream {
-    fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> {
+    fn read(&mut self, buf: &mut [u8]) -> IoResult<usize> {
         match *self {
             InternalStream::Tcp(ref mut s) => s.read(buf),
             InternalStream::Unix(ref mut s) => s.read(buf),

src/lib.rs

@@ -52,6 +52,7 @@
 #![doc(html_root_url="https://sfackler.github.io/doc")]
 #![feature(plugin, unsafe_destructor, slicing_syntax, old_orphan_check)]
 #![warn(missing_docs)]
+#![allow(unstable)]
 
 #[macro_use]
 extern crate log;
@@ -374,7 +375,7 @@ pub fn cancel_query<T>(params: T, ssl: &SslMode, data: CancelData)
 
 struct InnerConnection {
     stream: BufferedStream<MaybeSslStream<InternalStream>>,
-    next_stmt_id: uint,
+    next_stmt_id: usize,
     notice_handler: Box<NoticeHandler>,
     notifications: RingBuf<Notification>,
     cancel_data: CancelData,
@@ -666,7 +667,7 @@ impl InnerConnection {
     fn set_type_names<'a, I>(&mut self, mut it: I) -> Result<()>
             where I: Iterator<Item=&'a mut Type> {
         for ty in it {
-            if let &Type::Unknown { oid, ref mut name } = ty {
+            if let &mut Type::Unknown { oid, ref mut name } = ty {
                 *name = try!(self.get_type_name(oid));
             }
         }
@@ -958,7 +959,7 @@ impl Connection {
     /// or execution of the statement.
     ///
     /// On success, returns the number of rows modified or 0 if not applicable.
-    pub fn execute(&self, query: &str, params: &[&ToSql]) -> Result<uint> {
+    pub fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize> {
         let (param_types, result_desc) = try!(self.conn.borrow_mut().raw_prepare("", query));
         let stmt = Statement {
             conn: self,
@@ -1104,7 +1105,7 @@ impl<'conn> Transaction<'conn> {
     }
 
     /// Like `Connection::execute`.
-    pub fn execute(&self, query: &str, params: &[&ToSql]) -> Result<uint> {
+    pub fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize> {
         self.conn.execute(query, params)
     }
 
@@ -1196,7 +1197,7 @@ pub struct Statement<'conn> {
     name: String,
     param_types: Vec<Type>,
     result_desc: Vec<ResultDescription>,
-    next_portal_id: Cell<uint>,
+    next_portal_id: Cell<usize>,
     finished: bool,
 }
 
@@ -1303,7 +1304,7 @@ impl<'conn> Statement<'conn> {
     ///     Err(err) => println!("Error executing query: {}", err)
     /// }
     /// ```
-    pub fn execute(&self, params: &[&ToSql]) -> Result<uint> {
+    pub fn execute(&self, params: &[&ToSql]) -> Result<usize> {
         check_desync!(self.conn);
         try!(self.inner_execute("", 0, params));
 
@@ -1489,7 +1490,7 @@ impl<'stmt> Iterator for Rows<'stmt> {
     }
 
     #[inline]
-    fn size_hint(&self) -> (uint, Option<uint>) {
+    fn size_hint(&self) -> (usize, Option<usize>) {
         let lower = self.data.len();
         let upper = if self.more_rows {
             None
@@ -1508,7 +1509,7 @@ pub struct Row<'stmt> {
 
 impl<'stmt> Row<'stmt> {
     /// Returns the number of values in the row
-    pub fn len(&self) -> uint {
+    pub fn len(&self) -> usize {
         self.data.len()
     }
 
@@ -1553,7 +1554,7 @@ impl<'stmt> Row<'stmt> {
     pub fn get<I, T>(&self, idx: I) -> T where I: RowIndex + fmt::Show + Clone, T: FromSql {
         match self.get_opt(idx.clone()) {
             Ok(ok) => ok,
-            Err(err) => panic!("error retrieving column {}: {}", idx, err)
+            Err(err) => panic!("error retrieving column {:?}: {:?}", idx, err)
         }
     }
 }
@@ -1562,12 +1563,12 @@ impl<'stmt> Row<'stmt> {
 pub trait RowIndex {
     /// Returns the index of the appropriate column, or `None` if no such
     /// column exists.
-    fn idx(&self, stmt: &Statement) -> Option<uint>;
+    fn idx(&self, stmt: &Statement) -> Option<usize>;
 }
 
-impl RowIndex for uint {
+impl RowIndex for usize {
     #[inline]
-    fn idx(&self, stmt: &Statement) -> Option<uint> {
+    fn idx(&self, stmt: &Statement) -> Option<usize> {
         if *self >= stmt.result_desc.len() {
             None
         } else {
@@ -1578,7 +1579,7 @@ impl RowIndex for uint {
 
 impl<'a> RowIndex for &'a str {
     #[inline]
-    fn idx(&self, stmt: &Statement) -> Option<uint> {
+    fn idx(&self, stmt: &Statement) -> Option<usize> {
         stmt.result_descriptions().iter().position(|d| d.name == *self)
     }
 }
@@ -1603,7 +1604,7 @@ impl<'trans, 'stmt> Iterator for LazyRows<'trans, 'stmt> {
         self.result.try_next()
     }
 
-    fn size_hint(&self) -> (uint, Option<uint>) {
+    fn size_hint(&self) -> (usize, Option<usize>) {
         self.result.size_hint()
     }
 }
@@ -1643,7 +1644,7 @@ impl<'a> CopyInStatement<'a> {
     /// providing a single result row.
     ///
     /// Returns the number of rows copied.
-    pub fn execute<'b, I, J>(&self, mut rows: I) -> Result<uint>
+    pub fn execute<'b, I, J>(&self, mut rows: I) -> Result<usize>
             where I: Iterator<Item=J>, J: Iterator<Item=&'b (ToSql + 'b)> {
         let mut conn = self.conn.conn.borrow_mut();
 
@@ -1705,7 +1706,7 @@ impl<'a> CopyInStatement<'a> {
                                 // FIXME this is not the right way to handle this
                                 try_desync!(conn, conn.stream.write_message(
                                     &CopyFail {
-                                        message: &*err.to_string(),
+                                        message: &*format!("{:?}", err),
                                     }));
                                 break 'l;
                             }
@@ -1770,7 +1771,7 @@ pub trait GenericConnection {
     fn prepare<'a>(&'a self, query: &str) -> Result<Statement<'a>>;
 
     /// Like `Connection::execute`.
-    fn execute(&self, query: &str, params: &[&ToSql]) -> Result<uint>;
+    fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize>;
 
     /// Like `Connection::prepare_copy_in`.
     fn prepare_copy_in<'a>(&'a self, table: &str, columns: &[&str])
@@ -1788,7 +1789,7 @@ impl GenericConnection for Connection {
         self.prepare(query)
     }
 
-    fn execute(&self, query: &str, params: &[&ToSql]) -> Result<uint> {
+    fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize> {
         self.execute(query, params)
     }
 
@@ -1811,7 +1812,7 @@ impl<'a> GenericConnection for Transaction<'a> {
         self.prepare(query)
     }
 
-    fn execute(&self, query: &str, params: &[&ToSql]) -> Result<uint> {
+    fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize> {
         self.execute(query, params)
     }
 

src/message.rs

@@ -171,7 +171,7 @@ impl<W: Writer> WriteMessage for W {
                         None => try!(buf.write_be_i32(-1)),
                         Some(ref value) => {
                             try!(buf.write_be_i32(value.len() as i32));
-                            try!(buf.write(value[]));
+                            try!(buf.write(&**value));
                         }
                     }
                 }
@@ -230,8 +230,8 @@ impl<W: Writer> WriteMessage for W {
             StartupMessage { version, parameters } => {
                 try!(buf.write_be_u32(version));
                 for &(ref k, ref v) in parameters.iter() {
-                    try!(buf.write_cstr(k[]));
-                    try!(buf.write_cstr(v[]));
+                    try!(buf.write_cstr(&**k));
+                    try!(buf.write_cstr(&**v));
                 }
                 try!(buf.write_u8(0));
             }
@@ -246,7 +246,7 @@ impl<W: Writer> WriteMessage for W {
 
         // add size of length value
         try!(self.write_be_i32((buf.len() + mem::size_of::<i32>()) as i32));
-        try!(self.write(buf[]));
+        try!(self.write(&*buf));
 
         Ok(())
     }
@@ -286,7 +286,7 @@ impl<R: Buffer+Timeout> ReadMessage for R {
         let ident = try!(ident);
 
         // subtract size of length value
-        let len = try!(self.read_be_u32()) as uint - mem::size_of::<i32>();
+        let len = try!(self.read_be_u32()) as usize - mem::size_of::<i32>();
         let mut rdr = LimitReader::new(self.by_ref(), len);
 
         let ret = match ident {
@@ -360,13 +360,13 @@ fn read_fields<R: Buffer>(buf: &mut R) -> IoResult<Vec<(u8, String)>> {
 }
 
 fn read_data_row<R: Buffer>(buf: &mut R) -> IoResult<BackendMessage> {
-    let len = try!(buf.read_be_i16()) as uint;
+    let len = try!(buf.read_be_i16()) as usize;
     let mut values = Vec::with_capacity(len);
 
     for _ in range(0, len) {
         let val = match try!(buf.read_be_i32()) {
             -1 => None,
-            len => Some(try!(buf.read_exact(len as uint)))
+            len => Some(try!(buf.read_exact(len as usize)))
         };
         values.push(val);
     }
@@ -396,7 +396,7 @@ fn read_auth_message<R: Buffer>(buf: &mut R) -> IoResult<BackendMessage> {
 }
 
 fn read_parameter_description<R: Buffer>(buf: &mut R) -> IoResult<BackendMessage> {
-    let len = try!(buf.read_be_i16()) as uint;
+    let len = try!(buf.read_be_i16()) as usize;
     let mut types = Vec::with_capacity(len);
 
     for _ in range(0, len) {
@@ -407,7 +407,7 @@ fn read_parameter_description<R: Buffer>(buf: &mut R) -> IoResult<BackendMessage
 }
 
 fn read_row_description<R: Buffer>(buf: &mut R) -> IoResult<BackendMessage> {
-    let len = try!(buf.read_be_i16()) as uint;
+    let len = try!(buf.read_be_i16()) as usize;
     let mut types = Vec::with_capacity(len);
 
     for _ in range(0, len) {

src/types/mod.rs

@@ -2,6 +2,7 @@
 use serialize::json;
 use std::collections::HashMap;
 use std::io::net::ip::IpAddr;
+use std::fmt;
 
 use Result;
 use error::Error;
@@ -198,6 +199,18 @@ macro_rules! make_postgres_type {
             }
         }
 
+        impl fmt::String for Type {
+            fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+                let s = match *self {
+                    $(
+                        Type::$variant => stringify!($variant),
+                    )+
+                    Type::Unknown { ref name, .. } => &**name,
+                };
+                write!(fmt, "{}", s)
+            }
+        }
+
         impl Type {
             /// Creates a `Type` from an OID.
             ///
@@ -385,7 +398,7 @@ impl RawFromSql for IpAddr {
             return Err(Error::BadData);
         }
         let mut buf = [0u8; 16];
-        try!(raw.read_at_least(nb as uint, &mut buf));
+        try!(raw.read_at_least(nb as usize, &mut buf));
         let mut buf: &[u8] = &buf;
 
         match family {
@@ -451,7 +464,7 @@ impl FromSql for Option<HashMap<String, Option<String>>> {
 
                 for _ in range(0, count) {
                     let key_len = try!(rdr.read_be_i32());
-                    let key = try!(rdr.read_exact(key_len as uint));
+                    let key = try!(rdr.read_exact(key_len as usize));
                     let key = match String::from_utf8(key) {
                         Ok(key) => key,
                         Err(_) => return Err(Error::BadData),
@@ -461,7 +474,7 @@ impl FromSql for Option<HashMap<String, Option<String>>> {
                     let val = if val_len < 0 {
                         None
                     } else {
-                        let val = try!(rdr.read_exact(val_len as uint));
+                        let val = try!(rdr.read_exact(val_len as usize));
                         match String::from_utf8(val) {
                             Ok(val) => Some(val),
                             Err(_) => return Err(Error::BadData),