Merge branch 'release-v0.10.2' into release

Author: sfackler

.gitattributes

@@ -1,11 +1,11 @@
 [package]
 name = "postgres"
-version = "0.10.1"
+version = "0.10.2"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT"
 description = "A native PostgreSQL driver"
 repository = "https://github.com/sfackler/rust-postgres"
-documentation = "https://sfackler.github.io/rust-postgres/doc/v0.10.1/postgres"
+documentation = "https://sfackler.github.io/rust-postgres/doc/v0.10.2/postgres"
 readme = "README.md"
 keywords = ["database", "sql"]
 build = "build.rs"
@@ -31,7 +31,7 @@ phf = "0.7"
 rustc-serialize = "0.3"
 net2 = { version = "0.2", features = ["nightly"] }
 chrono = { version = "0.2.14", optional = true }
-openssl = { version = "0.6.4", optional = true }
+openssl = { version = ">= 0.6.4, < 0.8", optional = true }
 serde = { version = "0.3", optional = true } # Delete for 0.11
 serde_json = { version = "0.6", optional = true }
 time = { version = "0.1.14", optional = true }

.travis/update_docs.sh

@@ -1,7 +1,7 @@
 # Rust-Postgres
 A native PostgreSQL driver for Rust.
 
-[Documentation](https://sfackler.github.io/rust-postgres/doc/v0.10.1/postgres)
+[Documentation](https://sfackler.github.io/rust-postgres/doc/v0.10.2/postgres)
 
 [![Build Status](https://travis-ci.org/sfackler/rust-postgres.png?branch=master)](https://travis-ci.org/sfackler/rust-postgres) [![Latest Version](https://img.shields.io/crates/v/postgres.svg)](https://crates.io/crates/postgres)
 
@@ -198,16 +198,16 @@ types. The driver currently supports the following conversions:
         </tr>
         <tr>
             <td>
-                <a href="https://github.com/rust-lang/rustc-serialize">serialize::json::Json</a>
+                <a href="https://github.com/rust-lang-nursery/rustc-serialize">serialize::json::Json</a>
                 and
-                <a href="https://github.com/erickt/serde_json">serde_json::Value</a>
+                <a href="https://github.com/serde-rs/json">serde_json::Value</a>
                 (<a href="#optional-features">optional</a>)
             </td>
             <td>JSON, JSONB</td>
         </tr>
         <tr>
             <td>
-                <a href="https://github.com/rust-lang/time">time::Timespec</a>
+                <a href="https://github.com/rust-lang-deprecated/time">time::Timespec</a>
                 and
                 <a href="https://github.com/lifthrasiir/rust-chrono">chrono::NaiveDateTime</a>
                 (<a href="#optional-features">optional</a>)
@@ -216,7 +216,7 @@ types. The driver currently supports the following conversions:
         </tr>
         <tr>
             <td>
-                <a href="https://github.com/rust-lang/time">time::Timespec</a>,
+                <a href="https://github.com/rust-lang-deprecated/time">time::Timespec</a>,
                 <a href="https://github.com/lifthrasiir/rust-chrono">chrono::DateTime&lt;UTC&gt;</a>,
                 <a href="https://github.com/lifthrasiir/rust-chrono">chrono::DateTime&lt;Local&gt;</a>,
                 and
@@ -241,7 +241,7 @@ types. The driver currently supports the following conversions:
         </tr>
         <tr>
             <td>
-                <a href="https://github.com/rust-lang/uuid">uuid::Uuid</a>
+                <a href="https://github.com/rust-lang-nursery/uuid">uuid::Uuid</a>
                 (<a href="#optional-features">optional</a>)
             </td>
             <td>UUID</td>
@@ -284,8 +284,9 @@ implementations for `uuid`'s `Uuid` type.
 [JSON and JSONB](http://www.postgresql.org/docs/9.4/static/datatype-json.html)
 support is provided optionally by the `rustc-serialize` feature, which adds
 `ToSql` and `FromSql` implementations for `rustc-serialize`'s `Json` type, and
-the `serde` feature, which adds implementations for `serde_json`'s `Value`
-type.
+the `serde_json` feature, which adds implementations for `serde_json`'s `Value`
+type. The `serde` feature provides implementations for the older
+`serde::json::Value` type.
 
 ### TIMESTAMP/TIMESTAMPTZ/DATE/TIME types
 

Cargo.toml

@@ -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,
         }
     }
 }

README.md

@@ -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/error.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))
     }