Update to r2d2 0.8

Author: sfackler

Cargo.toml

@@ -18,6 +18,6 @@ name = "test"
 path = "tests/test.rs"
 
 [dependencies]
-r2d2 = "0.7"
+r2d2 = "0.8"
 postgres = "0.15"
 postgres-shared = "0.4"

src/lib.rs

@@ -27,16 +27,14 @@ pub enum TlsMode {
 /// ```rust,no_run
 /// extern crate r2d2;
 /// extern crate r2d2_postgres;
-/// extern crate postgres;
 ///
 /// use std::thread;
 /// use r2d2_postgres::{TlsMode, PostgresConnectionManager};
 ///
 /// fn main() {
-///     let config = r2d2::Config::default();
 ///     let manager = PostgresConnectionManager::new("postgres://postgres@localhost",
 ///                                                  TlsMode::None).unwrap();
-///     let pool = r2d2::Pool::new(config, manager).unwrap();
+///     let pool = r2d2::Pool::new(manager).unwrap();
 ///
 ///     for i in 0..10i32 {
 ///         let pool = pool.clone();
@@ -63,7 +61,7 @@ impl PostgresConnectionManager {
                   -> Result<PostgresConnectionManager>
         where T: IntoConnectParams
     {
-        // fixme we shouldn't be using this private constructor :(
+        // FIXME we shouldn't be using this private constructor :(
         let params = params.into_connect_params().map_err(postgres_shared::error::connect)?;
 
         Ok(PostgresConnectionManager {

tests/test.rs

@@ -2,7 +2,6 @@ extern crate postgres;
 extern crate r2d2;
 extern crate r2d2_postgres;
 
-use std::sync::Arc;
 use std::sync::mpsc;
 use std::thread;
 
@@ -13,8 +12,7 @@ fn test_basic() {
     let manager =
         PostgresConnectionManager::new("postgres://postgres:password@localhost", TlsMode::None)
             .unwrap();
-    let config = r2d2::Config::builder().pool_size(2).build();
-    let pool = Arc::new(r2d2::Pool::new(config, manager).unwrap());
+    let pool = r2d2::Pool::builder().max_size(2).build(manager).unwrap();
 
     let (s1, r1) = mpsc::channel();
     let (s2, r2) = mpsc::channel();
@@ -46,11 +44,10 @@ fn test_is_valid() {
     let manager =
         PostgresConnectionManager::new("postgres://postgres:password@localhost", TlsMode::None)
             .unwrap();
-    let config = r2d2::Config::builder()
-        .pool_size(1)
-        .test_on_check_out(true)
-        .build();
-    let pool = r2d2::Pool::new(config, manager).unwrap();
+    let pool = r2d2::Pool::builder()
+        .max_size(1)
+        .build(manager)
+        .unwrap();
 
     pool.get().unwrap();
 }