Rustfmt

Author: sfackler

src/error.rs

@@ -48,10 +48,10 @@ impl DbErrorNew for DbError {
                 None => match map.remove(&b'p') {
                     Some(pos) => Some(ErrorPosition::Internal {
                         position: try!(pos.parse().map_err(|_| ())),
-                        query: try!(map.remove(&b'q').ok_or(()))
+                        query: try!(map.remove(&b'q').ok_or(())),
                     }),
-                    None => None
-                }
+                    None => None,
+                },
             },
             where_: map.remove(&b'W'),
             schema: map.remove(&b's'),
@@ -194,7 +194,7 @@ impl error::Error for DbError {
 #[derive(Debug)]
 pub enum ConnectError {
     /// An error creating `ConnectParams`.
-    BadConnectParams(Box<error::Error+Sync+Send>),
+    BadConnectParams(Box<error::Error + Sync + Send>),
     /// The `ConnectParams` was missing a user.
     MissingUser,
     /// An error from the Postgres server itself.
@@ -207,7 +207,7 @@ pub enum ConnectError {
     /// The Postgres server does not support SSL encryption.
     NoSslSupport,
     /// An error initializing the SSL session.
-    SslError(Box<error::Error+Sync+Send>),
+    SslError(Box<error::Error + Sync + Send>),
     /// An error communicating with the server.
     IoError(io::Error),
 }
@@ -220,7 +220,7 @@ impl fmt::Display for ConnectError {
             ConnectError::DbError(ref err) => write!(fmt, ": {}", err),
             ConnectError::SslError(ref err) => write!(fmt, ": {}", err),
             ConnectError::IoError(ref err) => write!(fmt, ": {}", err),
-            _ => Ok(())
+            _ => Ok(()),
         }
     }
 }
@@ -231,7 +231,8 @@ impl error::Error for ConnectError {
             ConnectError::BadConnectParams(_) => "Error creating `ConnectParams`",
             ConnectError::MissingUser => "User missing in `ConnectParams`",
             ConnectError::DbError(_) => "Error reported by Postgres",
-            ConnectError::MissingPassword => "The server requested a password but none was provided",
+            ConnectError::MissingPassword =>
+                "The server requested a password but none was provided",
             ConnectError::UnsupportedAuthentication => {
                 "The server requested an unsupported authentication method"
             }
@@ -247,7 +248,7 @@ impl error::Error for ConnectError {
             ConnectError::DbError(ref err) => Some(&**err),
             ConnectError::SslError(ref err) => Some(&**err),
             ConnectError::IoError(ref err) => Some(err),
-            _ => None
+            _ => None,
         }
     }
 }
@@ -280,8 +281,8 @@ pub enum ErrorPosition {
         /// The byte position.
         position: u32,
         /// A query generated by the Postgres server.
-        query: String
-    }
+        query: String,
+    },
 }
 
 /// An error encountered when communicating with the Postgres server.
@@ -297,7 +298,7 @@ pub enum Error {
     /// An attempt was made to read from a column that does not exist.
     InvalidColumn,
     /// An error converting between Postgres and Rust types.
-    Conversion(Box<error::Error+Sync+Send>),
+    Conversion(Box<error::Error + Sync + Send>),
 }
 
 impl fmt::Display for Error {
@@ -329,7 +330,7 @@ impl error::Error for Error {
             Error::DbError(ref err) => Some(&**err),
             Error::IoError(ref err) => Some(err),
             Error::Conversion(ref err) => Some(&**err),
-            _ => None
+            _ => None,
         }
     }
 }

src/io/mod.rs

@@ -26,6 +26,8 @@ pub trait NegotiateSsl {
     ///
     /// The host portion of the connection parameters is provided for hostname
     /// verification.
-    fn negotiate_ssl(&self, host: &str, stream: Stream)
-                     -> Result<Box<StreamWrapper>, Box<Error+Sync+Send>>;
+    fn negotiate_ssl(&self,
+                     host: &str,
+                     stream: Stream)
+                     -> Result<Box<StreamWrapper>, Box<Error + Sync + Send>>;
 }

src/io/openssl.rs

@@ -16,8 +16,10 @@ impl StreamWrapper for SslStream<Stream> {
 }
 
 impl NegotiateSsl for SslContext {
-    fn negotiate_ssl(&self, _: &str, stream: Stream)
-                     -> Result<Box<StreamWrapper>, Box<Error+Send+Sync>> {
+    fn negotiate_ssl(&self,
+                     _: &str,
+                     stream: Stream)
+                     -> Result<Box<StreamWrapper>, Box<Error + Send + Sync>> {
         let stream = try!(SslStream::connect(self, stream));
         Ok(Box::new(stream))
     }