Merge branch 'release-v0.9.3' into release

Author: sfackler

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "r2d2_postgres"
-version = "0.9.2"
+version = "0.9.3"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT"
 description = "Postgres support for the r2d2 connection pool"
 repository = "https://github.com/sfackler/r2d2-postgres"
-documentation = "https://sfackler.github.io/r2d2-postgres/doc/v0.9.2/r2d2_postgres"
+documentation = "https://sfackler.github.io/r2d2-postgres/doc/v0.9.3/r2d2_postgres"
 keywords = ["postgres", "sql", "pool", "database"]
 
 [lib]
@@ -19,4 +19,4 @@ path = "tests/test.rs"
 
 [dependencies]
 r2d2 = "0.6"
-postgres = "0.9"
+postgres = "0.10"

README.md

@@ -3,9 +3,9 @@ r2d2-postgres
 
 [![Build Status](https://travis-ci.org/sfackler/r2d2-postgres.svg?branch=master)](https://travis-ci.org/sfackler/r2d2-postgres)
 
-[rust-postgres](https://github.com/sfackler/rust-postgres) support library for the [r2d2](https://github.com/sfackler/r2d2) connection pool.
+[Documentation](https://sfackler.github.io/r2d2-postgres/doc/v0.9.3/r2d2_postgres)
 
-Documentation is available at https://sfackler.github.io/r2d2-postgres/doc/v0.9.2/r2d2_postgres
+[rust-postgres](https://github.com/sfackler/rust-postgres) support library for the [r2d2](https://github.com/sfackler/r2d2) connection pool.
 
 # Example
 

src/lib.rs

@@ -1,5 +1,5 @@
 //! Postgres support for the `r2d2` connection pool.
-#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.9.2")]
+#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.9.3")]
 #![warn(missing_docs)]
 extern crate r2d2;
 extern crate postgres;
@@ -84,8 +84,13 @@ impl PostgresConnectionManager {
     /// types.
     pub fn new<T: IntoConnectParams>(params: T, ssl_mode: SslMode)
             -> Result<PostgresConnectionManager, postgres::error::ConnectError> {
+        let params = match params.into_connect_params() {
+            Ok(params) => params,
+            Err(err) => return Err(postgres::error::ConnectError::BadConnectParams(err)),
+        };
+
         Ok(PostgresConnectionManager {
-            params: try!(params.into_connect_params()),
+            params: params,
             ssl_mode: ssl_mode,
         })
     }