Commit06fde28

committed

Update to r2d2 0.8

1 parent9a408a7 commit06fde28Copy full SHA for 06fde28

File tree

-13

lines changed

-13

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,16 +27,14 @@ pub enum TlsMode {`
`27`	`27`	/// ```rust,no_run
`28`	`28`	`/// extern crate r2d2;`
`29`	`29`	`/// extern crate r2d2_postgres;`
`30`		`-/// extern crate postgres;`
`31`	`30`	`///`
`32`	`31`	`/// use std::thread;`
`33`	`32`	`/// use r2d2_postgres::{TlsMode, PostgresConnectionManager};`
`34`	`33`	`///`
`35`	`34`	`/// fn main() {`
`36`		`-/// let config = r2d2::Config::default();`
`37`	`35`	`/// let manager = PostgresConnectionManager::new("postgres://postgres@localhost",`
`38`	`36`	`/// TlsMode::None).unwrap();`
`39`		`-/// let pool = r2d2::Pool::new(config,manager).unwrap();`
	`37`	`+/// let pool = r2d2::Pool::new(manager).unwrap();`
`40`	`38`	`///`
`41`	`39`	`/// for i in 0..10i32 {`
`42`	`40`	`/// let pool = pool.clone();`
`@@ -63,7 +61,7 @@ impl PostgresConnectionManager {`
`63`	`61`	`->Result<PostgresConnectionManager>`
`64`	`62`	`whereT:IntoConnectParams`
`65`	`63`	`{`
`66`		`-//fixme we shouldn't be using this private constructor :(`
	`64`	`+//FIXME we shouldn't be using this private constructor :(`
`67`	`65`	`let params = params.into_connect_params().map_err(postgres_shared::error::connect)?;`
`68`	`66`
`69`	`67`	`Ok(PostgresConnectionManager{`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ extern crate postgres;`
`2`	`2`	`externcrate r2d2;`
`3`	`3`	`externcrate r2d2_postgres;`
`4`	`4`
`5`		`-use std::sync::Arc;`
`6`	`5`	`use std::sync::mpsc;`
`7`	`6`	`use std::thread;`
`8`	`7`
`@@ -13,8 +12,7 @@ fn test_basic() {`
`13`	`12`	`let manager =`
`14`	`13`	`PostgresConnectionManager::new("postgres://postgres:password@localhost",TlsMode::None)`
`15`	`14`	`.unwrap();`
`16`		`-let config = r2d2::Config::builder().pool_size(2).build();`
`17`		`-let pool =Arc::new(r2d2::Pool::new(config, manager).unwrap());`
	`15`	`+let pool = r2d2::Pool::builder().max_size(2).build(manager).unwrap();`
`18`	`16`
`19`	`17`	`let(s1, r1) = mpsc::channel();`
`20`	`18`	`let(s2, r2) = mpsc::channel();`
`@@ -46,11 +44,10 @@ fn test_is_valid() {`
`46`	`44`	`let manager =`
`47`	`45`	`PostgresConnectionManager::new("postgres://postgres:password@localhost",TlsMode::None)`
`48`	`46`	`.unwrap();`
`49`		`-let config = r2d2::Config::builder()`
`50`		`-.pool_size(1)`
`51`		`-.test_on_check_out(true)`
`52`		`-.build();`
`53`		`-let pool = r2d2::Pool::new(config, manager).unwrap();`
	`47`	`+let pool = r2d2::Pool::builder()`
	`48`	`+.max_size(1)`
	`49`	`+.build(manager)`
	`50`	`+.unwrap();`
`54`	`51`
`55`	`52`	`pool.get().unwrap();`
`56`	`53`	`}`

Comments

(0)