Merge branch 'release-v0.9.2' into release

Author: sfackler

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "r2d2_postgres"
-version = "0.9.1"
+version = "0.9.2"
 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.9.1/r2d2_postgres"
+documentation = "https://sfackler.github.io/r2d2-postgres/doc/v0.9.2/r2d2_postgres"
 keywords = ["postgres", "sql", "pool", "database"]
 
 [lib]
@@ -18,5 +18,5 @@ name = "test"
 path = "tests/test.rs"
 
 [dependencies]
-r2d2 = "0.5"
+r2d2 = "0.6"
 postgres = "0.9"

README.md

@@ -1,11 +1,11 @@
 r2d2-postgres
 =============
 
-[![Build Status](https://travis-ci.org/sfackler/r2d2-postgres.svg?branch=v0.6.0)](https://travis-ci.org/sfackler/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 is available at https://sfackler.github.io/r2d2-postgres/doc/v0.9.1/r2d2_postgres
+Documentation is available at https://sfackler.github.io/r2d2-postgres/doc/v0.9.2/r2d2_postgres
 
 # Example
 
@@ -21,11 +21,10 @@ use postgres::SslMode;
 use r2d2_postgres::PostgresConnectionManager;
 
 fn main() {
-    let config = Default::default();
+    let config = r2d2::Config::default();
     let manager = PostgresConnectionManager::new("postgres://postgres@localhost",
                                                  SslMode::None).unwrap();
-    let error_handler = Box::new(r2d2::LoggingErrorHandler);
-    let pool = Arc::new(r2d2::Pool::new(config, manager, error_handler).unwrap());
+    let pool = Arc::new(r2d2::Pool::new(config, manager).unwrap());
 
     for i in 0..10i32 {
         let pool = pool.clone();

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.1")]
+#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.9.2")]
 #![warn(missing_docs)]
 extern crate r2d2;
 extern crate postgres;
@@ -40,7 +40,7 @@ impl error::Error for Error {
     }
 }
 
-/// An `r2d2::ConnectionManager` for `postgres::Connection`s.
+/// An `r2d2::ManageConnection` for `postgres::Connection`s.
 ///
 /// ## Example
 ///
@@ -57,11 +57,10 @@ impl error::Error for Error {
 /// use r2d2_postgres::PostgresConnectionManager;
 ///
 /// fn main() {
-///     let config = Default::default();
+///     let config = r2d2::Config::default();
 ///     let manager = PostgresConnectionManager::new("postgres://postgres@localhost",
 ///                                                  SslMode::None).unwrap();
-///     let error_handler = Box::new(r2d2::LoggingErrorHandler);
-///     let pool = Arc::new(r2d2::Pool::new(config, manager, error_handler).unwrap());
+///     let pool = Arc::new(r2d2::Pool::new(config, manager).unwrap());
 ///
 ///     for i in 0..10i32 {
 ///         let pool = pool.clone();
@@ -92,7 +91,7 @@ impl PostgresConnectionManager {
     }
 }
 
-impl r2d2::ConnectionManager for PostgresConnectionManager {
+impl r2d2::ManageConnection for PostgresConnectionManager {
     type Connection = postgres::Connection;
     type Error = Error;
 

tests/test.rs

@@ -13,8 +13,7 @@ use r2d2_postgres::PostgresConnectionManager;
 fn test_basic() {
     let manager = PostgresConnectionManager::new("postgres://postgres@localhost", SslMode::None).unwrap();
     let config = r2d2::Config::builder().pool_size(2).build();
-    let handler = Box::new(r2d2::NoopErrorHandler);
-    let pool = Arc::new(r2d2::Pool::new(config, manager, handler).unwrap());
+    let pool = Arc::new(r2d2::Pool::new(config, manager).unwrap());
 
     let (s1, r1) = mpsc::channel();
     let (s2, r2) = mpsc::channel();
@@ -45,8 +44,7 @@ fn test_basic() {
 fn test_is_valid() {
     let manager = PostgresConnectionManager::new("postgres://postgres@localhost", SslMode::None).unwrap();
     let config = r2d2::Config::builder().pool_size(1).test_on_check_out(true).build();
-    let handler = Box::new(r2d2::NoopErrorHandler);
-    let pool = r2d2::Pool::new(config, manager, handler).unwrap();
+    let pool = r2d2::Pool::new(config, manager).unwrap();
 
     pool.get().unwrap();
 }