Merge branch 'release-v0.10.0' into release

Author: sfackler

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "r2d2_postgres"
-version = "0.9.3"
+version = "0.10.0"
 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.3/r2d2_postgres"
+documentation = "https://sfackler.github.io/r2d2-postgres/doc/v0.10.0/r2d2_postgres"
 keywords = ["postgres", "sql", "pool", "database"]
 
 [lib]
@@ -19,4 +19,4 @@ path = "tests/test.rs"
 
 [dependencies]
 r2d2 = "0.6"
-postgres = "0.10"
+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.9.3/r2d2_postgres)
+[Documentation](https://sfackler.github.io/r2d2-postgres/doc/v0.10.0/r2d2_postgres)
 
 [rust-postgres](https://github.com/sfackler/rust-postgres) support library for the [r2d2](https://github.com/sfackler/r2d2) connection pool.
 
@@ -14,17 +14,15 @@ extern crate r2d2;
 extern crate r2d2_postgres;
 extern crate postgres;
 
-use std::sync::Arc;
 use std::thread;
-use std::default::Default;
 use postgres::SslMode;
 use r2d2_postgres::PostgresConnectionManager;
 
 fn main() {
     let config = r2d2::Config::default();
     let manager = PostgresConnectionManager::new("postgres://postgres@localhost",
                                                  SslMode::None).unwrap();
-    let pool = Arc::new(r2d2::Pool::new(config, manager).unwrap());
+    let pool = r2d2::Pool::new(config, manager).unwrap();
 
     for i in 0..10i32 {
         let pool = pool.clone();

src/lib.rs

@@ -1,13 +1,25 @@
 //! Postgres support for the `r2d2` connection pool.
-#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.9.3")]
+#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.10.0")]
 #![warn(missing_docs)]
 extern crate r2d2;
 extern crate postgres;
 
 use std::error;
 use std::error::Error as _StdError;
 use std::fmt;
-use postgres::{IntoConnectParams, SslMode};
+use postgres::{IntoConnectParams};
+use postgres::io::NegotiateSsl;
+
+/// Like `postgres::SslMode` except that it owns its `NegotiateSsl` instance.
+#[derive(Debug)]
+pub enum SslMode {
+    /// Like `postgres::SslMode::None`.
+    None,
+    /// Like `postgres::SslMode::Prefer`.
+    Prefer(Box<NegotiateSsl + Sync + Send>),
+    /// Like `postgres::SslMode::Require`.
+    Require(Box<NegotiateSsl + Sync + Send>),
+}
 
 /// A unified enum of errors returned by postgres::Connection
 #[derive(Debug)]
@@ -45,22 +57,18 @@ impl error::Error for Error {
 /// ## Example
 ///
 /// ```rust,no_run
-/// #![allow(unstable)]
 /// extern crate r2d2;
 /// extern crate r2d2_postgres;
 /// extern crate postgres;
 ///
-/// use std::sync::Arc;
-/// use std::default::Default;
 /// use std::thread;
-/// use postgres::SslMode;
-/// use r2d2_postgres::PostgresConnectionManager;
+/// use r2d2_postgres::{SslMode, PostgresConnectionManager};
 ///
 /// fn main() {
 ///     let config = r2d2::Config::default();
 ///     let manager = PostgresConnectionManager::new("postgres://postgres@localhost",
 ///                                                  SslMode::None).unwrap();
-///     let pool = Arc::new(r2d2::Pool::new(config, manager).unwrap());
+///     let pool = r2d2::Pool::new(config, manager).unwrap();
 ///
 ///     for i in 0..10i32 {
 ///         let pool = pool.clone();
@@ -86,7 +94,7 @@ impl PostgresConnectionManager {
             -> Result<PostgresConnectionManager, postgres::error::ConnectError> {
         let params = match params.into_connect_params() {
             Ok(params) => params,
-            Err(err) => return Err(postgres::error::ConnectError::BadConnectParams(err)),
+            Err(err) => return Err(postgres::error::ConnectError::ConnectParams(err)),
         };
 
         Ok(PostgresConnectionManager {
@@ -101,7 +109,12 @@ impl r2d2::ManageConnection for PostgresConnectionManager {
     type Error = Error;
 
     fn connect(&self) -> Result<postgres::Connection, Error> {
-        postgres::Connection::connect(self.params.clone(), &self.ssl_mode).map_err(Error::Connect)
+        let mode = match self.ssl_mode {
+            SslMode::None => postgres::SslMode::None,
+            SslMode::Prefer(ref n) => postgres::SslMode::Prefer(&**n),
+            SslMode::Require(ref n) => postgres::SslMode::Require(&**n),
+        };
+        postgres::Connection::connect(self.params.clone(), mode).map_err(Error::Connect)
     }
 
     fn is_valid(&self, conn: &mut postgres::Connection) -> Result<(), Error> {

tests/test.rs

@@ -6,8 +6,7 @@ use std::sync::Arc;
 use std::sync::mpsc;
 use std::thread;
 
-use postgres::SslMode;
-use r2d2_postgres::PostgresConnectionManager;
+use r2d2_postgres::{SslMode, PostgresConnectionManager};
 
 #[test]
 fn test_basic() {