Commitcca117c

committed

Bump to r2d2 v0.9

1 parentc455ddc commitcca117cCopy full SHA for cca117c

File tree

-13

lines changed

-13

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,10 @@ use postgres::SslMode;`
`21`	`21`	`user2d2_postgres::PostgresConnectionManager;`
`22`	`22`
`23`	`23`	`fnmain() {`
`24`		`-letconfig=Default::default();`
	`24`	`+letconfig=r2d2::Config::default();`
`25`	`25`	`letmanager=PostgresConnectionManager::new("postgres://postgres@localhost",`
`26`	`26`	`SslMode::None).unwrap();`
`27`		`-leterror_handler=Box::new(r2d2::LoggingErrorHandler);`
`28`		`-letpool=Arc::new(r2d2::Pool::new(config,manager,error_handler).unwrap());`
	`27`	`+letpool=Arc::new(r2d2::Pool::new(config,manager).unwrap());`
`29`	`28`
`30`	`29`	`foriin0..10i32 {`
`31`	`30`	`letpool=pool.clone();`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ impl error::Error for Error {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		-/// An `r2d2::ConnectionManager` for `postgres::Connection`s.
	`43`	+/// An `r2d2::ManageConnection` for `postgres::Connection`s.
`44`	`44`	`///`
`45`	`45`	`/// ## Example`
`46`	`46`	`///`
`@@ -57,11 +57,10 @@ impl error::Error for Error {`
`57`	`57`	`/// use r2d2_postgres::PostgresConnectionManager;`
`58`	`58`	`///`
`59`	`59`	`/// fn main() {`
`60`		`-/// let config =Default::default();`
	`60`	`+/// let config =r2d2::Config::default();`
`61`	`61`	`/// let manager = PostgresConnectionManager::new("postgres://postgres@localhost",`
`62`	`62`	`/// SslMode::None).unwrap();`
`63`		`-/// let error_handler = Box::new(r2d2::LoggingErrorHandler);`
`64`		`-/// let pool = Arc::new(r2d2::Pool::new(config, manager, error_handler).unwrap());`
	`63`	`+/// let pool = Arc::new(r2d2::Pool::new(config, manager).unwrap());`
`65`	`64`	`///`
`66`	`65`	`/// for i in 0..10i32 {`
`67`	`66`	`/// let pool = pool.clone();`
`@@ -92,7 +91,7 @@ impl PostgresConnectionManager {`
`92`	`91`	`}`
`93`	`92`	`}`
`94`	`93`
`95`		`-impl r2d2::ConnectionManagerforPostgresConnectionManager{`
	`94`	`+impl r2d2::ManageConnectionforPostgresConnectionManager{`
`96`	`95`	`typeConnection = postgres::Connection;`
`97`	`96`	`typeError =Error;`
`98`	`97`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@ use r2d2_postgres::PostgresConnectionManager;`
`13`	`13`	`fntest_basic(){`
`14`	`14`	`let manager =PostgresConnectionManager::new("postgres://postgres@localhost",SslMode::None).unwrap();`
`15`	`15`	`let config = r2d2::Config::builder().pool_size(2).build();`
`16`		`-let handler =Box::new(r2d2::NoopErrorHandler);`
`17`		`-let pool =Arc::new(r2d2::Pool::new(config, manager, handler).unwrap());`
	`16`	`+let pool =Arc::new(r2d2::Pool::new(config, manager).unwrap());`
`18`	`17`
`19`	`18`	`let(s1, r1) = mpsc::channel();`
`20`	`19`	`let(s2, r2) = mpsc::channel();`
`@@ -45,8 +44,7 @@ fn test_basic() {`
`45`	`44`	`fntest_is_valid(){`
`46`	`45`	`let manager =PostgresConnectionManager::new("postgres://postgres@localhost",SslMode::None).unwrap();`
`47`	`46`	`let config = r2d2::Config::builder().pool_size(1).test_on_check_out(true).build();`
`48`		`-let handler =Box::new(r2d2::NoopErrorHandler);`
`49`		`-let pool = r2d2::Pool::new(config, manager, handler).unwrap();`
	`47`	`+let pool = r2d2::Pool::new(config, manager).unwrap();`
`50`	`48`
`51`	`49`	`pool.get().unwrap();`
`52`	`50`	`}`

Comments

(0)