Random cleanup

Author: sfackler

src/error.rs

@@ -13,27 +13,27 @@ use types::Type;
 
 include!(concat!(env!("OUT_DIR"), "/sqlstate.rs"));
 
-/// Reasons a new Postgres connection could fail
+/// Reasons a new Postgres connection could fail.
 #[derive(Debug)]
 pub enum ConnectError {
-    /// The provided URL could not be parsed
+    /// The provided URL could not be parsed.
     InvalidUrl(String),
-    /// The URL was missing a user
+    /// The URL was missing a user.
     MissingUser,
-    /// An error from the Postgres server itself
+    /// An error from the Postgres server itself.
     DbError(DbError),
-    /// A password was required but not provided in the URL
+    /// A password was required but not provided in the URL.
     MissingPassword,
     /// The Postgres server requested an authentication method not supported
-    /// by the driver
+    /// by the driver.
     UnsupportedAuthentication,
-    /// The Postgres server does not support SSL encryption
+    /// The Postgres server does not support SSL encryption.
     NoSslSupport,
-    /// There was an error initializing the SSL session
+    /// There was an error initializing the SSL session.
     SslError(SslError),
-    /// There was an error communicating with the server
+    /// There was an error communicating with the server.
     IoError(io::Error),
-    /// The server sent an unexpected response
+    /// The server sent an unexpected response.
     BadResponse,
 }
 
@@ -98,38 +98,38 @@ impl From<byteorder::Error> for ConnectError {
     }
 }
 
-/// Represents the position of an error in a query
+/// Represents the position of an error in a query.
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub enum ErrorPosition {
-    /// A position in the original query
+    /// A position in the original query.
     Normal(u32),
-    /// A position in an internally generated query
+    /// A position in an internally generated query.
     Internal {
-        /// The byte position
+        /// The byte position.
         position: u32,
-        /// A query generated by the Postgres server
+        /// A query generated by the Postgres server.
         query: String
     }
 }
 
-/// An error encountered when communicating with the Postgres server
+/// An error encountered when communicating with the Postgres server.
 #[derive(Debug)]
 pub enum Error {
-    /// An error reported by the Postgres server
+    /// An error reported by the Postgres server.
     DbError(DbError),
-    /// An error communicating with the Postgres server
+    /// An error communicating with the Postgres server.
     IoError(io::Error),
     /// The communication channel with the Postgres server has desynchronized
     /// due to an earlier communications error.
     StreamDesynchronized,
     /// An attempt was made to convert between incompatible Rust and Postgres
-    /// types
+    /// types.
     WrongType(Type),
-    /// An attempt was made to read from a column that does not exist
+    /// An attempt was made to read from a column that does not exist.
     InvalidColumn,
-    /// A value was NULL but converted to a non-nullable Rust type
+    /// A value was NULL but converted to a non-nullable Rust type.
     WasNull,
-    /// The server returned an unexpected response
+    /// The server returned an unexpected response.
     BadResponse,
 }
 

src/lib.rs

@@ -232,18 +232,18 @@ impl HandleNotice for LoggingNoticeHandler {
     }
 }
 
-/// An asynchronous notification
+/// An asynchronous notification.
 #[derive(Clone, Debug)]
 pub struct Notification {
-    /// The process ID of the notifying backend process
+    /// The process ID of the notifying backend process.
     pub pid: u32,
-    /// The name of the channel that the notify has been raised on
+    /// The name of the channel that the notify has been raised on.
     pub channel: String,
-    /// The "payload" string passed from the notifying process
+    /// The "payload" string passed from the notifying process.
     pub payload: String,
 }
 
-/// An iterator over asynchronous notifications
+/// An iterator over asynchronous notifications.
 pub struct Notifications<'conn> {
     conn: &'conn Connection
 }
@@ -350,12 +350,12 @@ impl<'conn> Notifications<'conn> {
     */
 }
 
-/// Contains information necessary to cancel queries for a session
+/// Contains information necessary to cancel queries for a session.
 #[derive(Copy, Clone, Debug)]
 pub struct CancelData {
-    /// The process ID of the session
+    /// The process ID of the session.
     pub process_id: u32,
-    /// The secret key for the session
+    /// The secret key for the session.
     pub secret_key: u32,
 }
 
@@ -1246,14 +1246,14 @@ impl Connection {
     }
 }
 
-/// Specifies the SSL support requested for a new connection
+/// Specifies the SSL support requested for a new connection.
 #[derive(Debug)]
 pub enum SslMode {
-    /// The connection will not use SSL
+    /// The connection will not use SSL.
     None,
-    /// The connection will use SSL if the backend supports it
+    /// The connection will use SSL if the backend supports it.
     Prefer(SslContext),
-    /// The connection must use SSL
+    /// The connection must use SSL.
     Require(SslContext)
 }
 
@@ -1387,7 +1387,7 @@ impl<'conn> Transaction<'conn> {
     }
 }
 
-/// A prepared statement
+/// A prepared statement.
 pub struct Statement<'conn> {
     conn: &'conn Connection,
     name: String,
@@ -1833,7 +1833,7 @@ impl<'a> fmt::Debug for Row<'a> {
 }
 
 impl<'a> Row<'a> {
-    /// Returns the number of values in the row
+    /// Returns the number of values in the row.
     pub fn len(&self) -> usize {
         self.data.len()
     }
@@ -1925,7 +1925,7 @@ impl<'a> RowIndex for &'a str {
     }
 }
 
-/// A lazily-loaded iterator over the resulting rows of a query
+/// A lazily-loaded iterator over the resulting rows of a query.
 pub struct LazyRows<'trans, 'stmt> {
     stmt: &'stmt Statement<'stmt>,
     data: VecDeque<Vec<Option<Vec<u8>>>>,
@@ -2017,7 +2017,7 @@ impl<'trans, 'stmt> Iterator for LazyRows<'trans, 'stmt> {
     }
 }
 
-/// A prepared COPY FROM STDIN statement
+/// A prepared `COPY FROM STDIN` statement.
 pub struct CopyInStatement<'a> {
     conn: &'a Connection,
     name: String,

src/types/mod.rs

@@ -52,7 +52,7 @@ mod rustc_serialize;
 #[cfg(feature = "serde")]
 mod serde;
 
-/// A Postgres OID
+/// A Postgres OID.
 pub type Oid = u32;
 
 /// Represents the kind of a Postgres type.
@@ -76,14 +76,14 @@ macro_rules! as_expr {
 
 macro_rules! make_postgres_type {
     ($(#[$doc:meta] $oid:tt => $variant:ident: $kind:expr),+) => (
-        /// A Postgres type
+        /// A Postgres type.
         #[derive(PartialEq, Eq, Clone)]
         pub enum Type {
             $(
                 #[$doc]
                 $variant,
             )+
-            /// An unknown type
+            /// An unknown type.
             Other(Box<Other>),
         }
 
@@ -125,7 +125,7 @@ macro_rules! make_postgres_type {
                 }
             }
 
-            /// The kind of this type
+            /// The kind of this type.
             pub fn kind(&self) -> &Kind {
                 match *self {
                     $(
@@ -491,13 +491,13 @@ pub trait FromSql: Sized {
 impl<T: FromSql> FromSql for Option<T> {
     fn from_sql_nullable<R: Read>(ty: &Type, raw: Option<&mut R>) -> Result<Option<T>> {
         match raw {
-            Some(raw) => <T as FromSql>::from_sql(ty, raw).map(|e| Some(e)),
+            Some(raw) => <T as FromSql>::from_sql(ty, raw).map(Some),
             None => Ok(None),
         }
     }
 
     fn from_sql<R: Read>(ty: &Type, raw: &mut R) -> Result<Option<T>> {
-        <T as FromSql>::from_sql(ty, raw).map(|e| Some(e))
+        <T as FromSql>::from_sql(ty, raw).map(Some)
     }
 
     fn accepts(ty: &Type) -> bool {
@@ -539,6 +539,14 @@ impl FromSql for String {
     }
 }
 
+impl FromSql for i8 {
+    fn from_sql<R: Read>(_: &Type, raw: &mut R) -> Result<i8> {
+        Ok(try!(raw.read_i8()))
+    }
+
+    accepts!(Type::Char);
+}
+
 macro_rules! primitive_from {
     ($t:ty, $f:ident, $($expected:pat),+) => {
         impl FromSql for $t {
@@ -551,14 +559,6 @@ macro_rules! primitive_from {
     }
 }
 
-impl FromSql for i8 {
-    fn from_sql<R: Read>(_: &Type, raw: &mut R) -> Result<i8> {
-        Ok(try!(raw.read_i8()))
-    }
-
-    accepts!(Type::Char);
-}
-
 primitive_from!(i16, read_i16, Type::Int2);
 primitive_from!(i32, read_i32, Type::Int4);
 primitive_from!(u32, read_u32, Type::Oid);
@@ -575,8 +575,7 @@ impl FromSql for HashMap<String, Option<String>> {
 
         for _ in 0..count {
             let key_len = try!(raw.read_i32::<BigEndian>());
-            let mut key = vec![];
-            key.extend((0..key_len).map(|_| 0));
+            let mut key = vec![0; key_len as usize];
             try!(util::read_all(raw, &mut key));
             let key = match String::from_utf8(key) {
                 Ok(key) => key,
@@ -587,8 +586,7 @@ impl FromSql for HashMap<String, Option<String>> {
             let val = if val_len < 0 {
                 None
             } else {
-                let mut val = vec![];
-                val.extend((0..val_len).map(|_| 0));
+                let mut val = vec![0; val_len as usize];
                 try!(util::read_all(raw, &mut val));
                 match String::from_utf8(val) {
                     Ok(val) => Some(val),
@@ -690,7 +688,7 @@ impl ToSql for Vec<u8> {
     to_sql_checked!();
 
     fn to_sql<W: Write+?Sized>(&self, ty: &Type, w: &mut W) -> Result<IsNull> {
-        (&**self).to_sql(ty, w)
+        <&[u8] as ToSql>::to_sql(&&**self, ty, w)
     }
 
     fn accepts(ty: &Type) -> bool {
@@ -725,14 +723,25 @@ impl ToSql for String {
     to_sql_checked!();
 
     fn to_sql<W: Write+?Sized>(&self, ty: &Type, w: &mut W) -> Result<IsNull> {
-        (&**self).to_sql(ty, w)
+        <&str as ToSql>::to_sql(&&**self, ty, w)
     }
 
     fn accepts(ty: &Type) -> bool {
         <&str as ToSql>::accepts(ty)
     }
 }
 
+impl ToSql for i8 {
+    to_sql_checked!();
+
+    fn to_sql<W: Write+?Sized>(&self, _: &Type, mut w: &mut W) -> Result<IsNull> {
+        try!(w.write_i8(*self));
+        Ok(IsNull::No)
+    }
+
+    accepts!(Type::Char);
+}
+
 macro_rules! to_primitive {
     ($t:ty, $f:ident, $($expected:pat),+) => {
         impl ToSql for $t {
@@ -748,17 +757,6 @@ macro_rules! to_primitive {
     }
 }
 
-impl ToSql for i8 {
-    to_sql_checked!();
-
-    fn to_sql<W: Write+?Sized>(&self, _: &Type, mut w: &mut W) -> Result<IsNull> {
-        try!(w.write_i8(*self));
-        Ok(IsNull::No)
-    }
-
-    accepts!(Type::Char);
-}
-
 to_primitive!(i16, write_i16, Type::Int2);
 to_primitive!(i32, write_i32, Type::Int4);
 to_primitive!(u32, write_u32, Type::Oid);
@@ -772,7 +770,7 @@ impl ToSql for HashMap<String, Option<String>> {
     fn to_sql<W: Write+?Sized>(&self, _: &Type, mut w: &mut W) -> Result<IsNull> {
         try!(w.write_i32::<BigEndian>(self.len() as i32));
 
-        for (key, val) in self.iter() {
+        for (key, val) in self {
             try!(w.write_i32::<BigEndian>(key.len() as i32));
             try!(w.write_all(key.as_bytes()));
 

src/ugh_privacy.rs

@@ -34,7 +34,7 @@ impl Other {
         self.oid
     }
 
-    /// The kind of this type
+    /// The kind of this type.
     pub fn kind(&self) -> &Kind {
         &self.kind
     }