Skip to content

Commit 8a71b06

Browse files
committed
Update for r2d2 change
1 parent 1bdde39 commit 8a71b06

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ pub struct PostgresPoolManager {
1010
}
1111

1212
impl PostgresPoolManager {
13-
pub fn new<T: IntoConnectParams>(params: T, ssl_mode: SslMode)
14-
-> PostgresPoolManager {
13+
pub fn new<T: IntoConnectParams>(params: T, ssl_mode: SslMode) -> PostgresPoolManager {
1514
PostgresPoolManager {
1615
params: params.into_connect_params(),
1716
ssl_mode: ssl_mode,

tests/test.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ use std::sync::{Arc, Future};
77
use std::comm;
88

99
use postgres::NoSsl;
10-
use postgres::error::{SocketError, InvalidUrl, PostgresConnectError};
10+
use postgres::error::{SocketError, InvalidUrl};
1111
use r2d2_postgres::PostgresPoolManager;
1212

1313
#[test]
1414
fn test_bad_url_deferred() {
1515
let manager = PostgresPoolManager::new("not a url", NoSsl);
1616
let config = Default::default();
17-
let handler = r2d2::NoopErrorHandler::<PostgresConnectError>;
17+
let handler = r2d2::NoopErrorHandler;
1818
match r2d2::Pool::new(config, manager, handler) {
1919
Err(r2d2::ConnectionError(InvalidUrl(_))) => {}
2020
Err(err) => fail!("Unexpected error {}", err),
@@ -26,7 +26,7 @@ fn test_bad_url_deferred() {
2626
fn test_bad_host_error() {
2727
let manager = PostgresPoolManager::new("postgres://bogushost", NoSsl);
2828
let config = Default::default();
29-
let handler = r2d2::NoopErrorHandler::<PostgresConnectError>;
29+
let handler = r2d2::NoopErrorHandler;
3030
match r2d2::Pool::new(config, manager, handler) {
3131
Err(r2d2::ConnectionError(SocketError(_))) => {}
3232
Err(err) => fail!("Unexpected error {}", err),
@@ -41,7 +41,7 @@ fn test_basic() {
4141
pool_size: 2,
4242
..Default::default()
4343
};
44-
let handler = r2d2::NoopErrorHandler::<PostgresConnectError>;
44+
let handler = r2d2::NoopErrorHandler;
4545
let pool = Arc::new(r2d2::Pool::new(config, manager, handler).unwrap());
4646

4747
let (s1, r1) = comm::channel();

0 commit comments

Comments
 (0)