Merge branch 'release-v0.10.1' into release

Author: sfackler

.travis.yml

@@ -2,7 +2,7 @@ language: rust
 rust:
 - nightly
 - beta
-- stable
+- 1.8.0
 addons:
   postgresql: 9.3
 script:

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "r2d2_postgres"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 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.10.0/r2d2_postgres"
+documentation = "https://sfackler.github.io/r2d2-postgres/doc/v0.10.1/r2d2_postgres"
 keywords = ["postgres", "sql", "pool", "database"]
 
 [lib]
@@ -18,5 +18,5 @@ name = "test"
 path = "tests/test.rs"
 
 [dependencies]
-r2d2 = "0.6"
+r2d2 = ">= 0.6, < 0.8"
 postgres = "0.11"

README.md

@@ -3,7 +3,7 @@ r2d2-postgres
 
 [![Build Status](https://travis-ci.org/sfackler/r2d2-postgres.svg?branch=master)](https://travis-ci.org/sfackler/r2d2-postgres)
 
-[Documentation](https://sfackler.github.io/r2d2-postgres/doc/v0.10.0/r2d2_postgres)
+[Documentation](https://sfackler.github.io/r2d2-postgres/doc/v0.10.1/r2d2_postgres)
 
 [rust-postgres](https://github.com/sfackler/rust-postgres) support library for the [r2d2](https://github.com/sfackler/r2d2) connection pool.
 
@@ -15,8 +15,7 @@ extern crate r2d2_postgres;
 extern crate postgres;
 
 use std::thread;
-use postgres::SslMode;
-use r2d2_postgres::PostgresConnectionManager;
+use r2d2_postgres::{SslMode, PostgresConnectionManager};
 
 fn main() {
     let config = r2d2::Config::default();

src/lib.rs

@@ -1,13 +1,13 @@
 //! Postgres support for the `r2d2` connection pool.
-#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.10.0")]
+#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.10.1")]
 #![warn(missing_docs)]
 extern crate r2d2;
 extern crate postgres;
 
 use std::error;
 use std::error::Error as _StdError;
 use std::fmt;
-use postgres::{IntoConnectParams};
+use postgres::IntoConnectParams;
 use postgres::io::NegotiateSsl;
 
 /// Like `postgres::SslMode` except that it owns its `NegotiateSsl` instance.
@@ -90,8 +90,10 @@ impl PostgresConnectionManager {
     ///
     /// See `postgres::Connection::connect` for a description of the parameter
     /// types.
-    pub fn new<T: IntoConnectParams>(params: T, ssl_mode: SslMode)
-            -> Result<PostgresConnectionManager, postgres::error::ConnectError> {
+    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::ConnectParams(err)),