Commit5f5091f

committed

Merge branch 'release-v0.9.3' into release

2 parents9838f14 +1f3e6ac commit5f5091fCopy full SHA for 5f5091f

File tree

+12

-7

lines changed

+12

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`[package]`
`2`	`2`	`name ="r2d2_postgres"`
`3`		`-version ="0.9.2"`
	`3`	`+version ="0.9.3"`
`4`	`4`	`authors = ["Steven Fackler <sfackler@gmail.com>"]`
`5`	`5`	`license ="MIT"`
`6`	`6`	`description ="Postgres support for the r2d2 connection pool"`
`7`	`7`	`repository ="https://github.com/sfackler/r2d2-postgres"`
`8`		`-documentation ="https://sfackler.github.io/r2d2-postgres/doc/v0.9.2/r2d2_postgres"`
	`8`	`+documentation ="https://sfackler.github.io/r2d2-postgres/doc/v0.9.3/r2d2_postgres"`
`9`	`9`	`keywords = ["postgres","sql","pool","database"]`
`10`	`10`
`11`	`11`	`[lib]`
`@@ -19,4 +19,4 @@ path = "tests/test.rs"`
`19`	`19`
`20`	`20`	`[dependencies]`
`21`	`21`	`r2d2 ="0.6"`
`22`		`-postgres ="0.9"`
	`22`	`+postgres ="0.10"`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ r2d2-postgres`
`3`	`3`
`4`	`4`	`[![Build Status](https://travis-ci.org/sfackler/r2d2-postgres.svg?branch=master)](https://travis-ci.org/sfackler/r2d2-postgres)`
`5`	`5`
`6`		`-[rust-postgres](https://github.com/sfackler/rust-postgres) support library for the[r2d2](https://github.com/sfackler/r2d2) connection pool.`
	`6`	`+[Documentation](https://sfackler.github.io/r2d2-postgres/doc/v0.9.3/r2d2_postgres)`
`7`	`7`
`8`		`-Documentation is available athttps://sfackler.github.io/r2d2-postgres/doc/v0.9.2/r2d2_postgres`
	`8`	`+[rust-postgres](https://github.com/sfackler/rust-postgres) support library for the[r2d2](https://github.com/sfackler/r2d2) connection pool.`
`9`	`9`
`10`	`10`	`#Example`
`11`	`11`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	//! Postgres support for the `r2d2` connection pool.
`2`		`-#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.9.2")]`
	`2`	`+#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.9.3")]`
`3`	`3`	`#![warn(missing_docs)]`
`4`	`4`	`externcrate r2d2;`
`5`	`5`	`externcrate postgres;`
`@@ -84,8 +84,13 @@ impl PostgresConnectionManager {`
`84`	`84`	`/// types.`
`85`	`85`	`pubfnnew<T:IntoConnectParams>(params:T,ssl_mode:SslMode)`
`86`	`86`	`->Result<PostgresConnectionManager, postgres::error::ConnectError>{`
	`87`	`+let params =match params.into_connect_params(){`
	`88`	`+Ok(params) => params,`
	`89`	`+Err(err) =>returnErr(postgres::error::ConnectError::BadConnectParams(err)),`
	`90`	`+};`
	`91`	`+`
`87`	`92`	`Ok(PostgresConnectionManager{`
`88`		`-params:try!(params.into_connect_params()),`
	`93`	`+params: params,`
`89`	`94`	`ssl_mode: ssl_mode,`
`90`	`95`	`})`
`91`	`96`	`}`

Comments

(0)