Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commite3db672

Browse files
committed
Merge branch 'release-v0.10.1' into release
2 parents91fd78a +c452866 commite3db672

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: rust
22
rust:
33
-nightly
44
-beta
5-
-stable
5+
-1.8.0
66
addons:
77
postgresql:9.3
88
script:

‎Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name ="r2d2_postgres"
3-
version ="0.10.0"
3+
version ="0.10.1"
44
authors = ["Steven Fackler <sfackler@gmail.com>"]
55
license ="MIT"
66
description ="Postgres support for the r2d2 connection pool"
77
repository ="https://github.com/sfackler/r2d2-postgres"
8-
documentation ="https://sfackler.github.io/r2d2-postgres/doc/v0.10.0/r2d2_postgres"
8+
documentation ="https://sfackler.github.io/r2d2-postgres/doc/v0.10.1/r2d2_postgres"
99
keywords = ["postgres","sql","pool","database"]
1010

1111
[lib]
@@ -18,5 +18,5 @@ name = "test"
1818
path ="tests/test.rs"
1919

2020
[dependencies]
21-
r2d2 ="0.6"
21+
r2d2 =">=0.6, < 0.8"
2222
postgres ="0.11"

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ r2d2-postgres
33

44
[![Build Status](https://travis-ci.org/sfackler/r2d2-postgres.svg?branch=master)](https://travis-ci.org/sfackler/r2d2-postgres)
55

6-
[Documentation](https://sfackler.github.io/r2d2-postgres/doc/v0.10.0/r2d2_postgres)
6+
[Documentation](https://sfackler.github.io/r2d2-postgres/doc/v0.10.1/r2d2_postgres)
77

88
[rust-postgres](https://github.com/sfackler/rust-postgres) support library for the[r2d2](https://github.com/sfackler/r2d2) connection pool.
99

@@ -15,8 +15,7 @@ extern crate r2d2_postgres;
1515
externcrate postgres;
1616

1717
usestd::thread;
18-
usepostgres::SslMode;
19-
user2d2_postgres::PostgresConnectionManager;
18+
user2d2_postgres::{SslMode,PostgresConnectionManager};
2019

2120
fnmain() {
2221
letconfig=r2d2::Config::default();

‎src/lib.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//! Postgres support for the `r2d2` connection pool.
2-
#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.10.0")]
2+
#![doc(html_root_url="https://sfackler.github.io/r2d2-postgres/doc/v0.10.1")]
33
#![warn(missing_docs)]
44
externcrate r2d2;
55
externcrate postgres;
66

77
use std::error;
88
use std::error::Erroras _StdError;
99
use std::fmt;
10-
use postgres::{IntoConnectParams};
10+
use postgres::IntoConnectParams;
1111
use postgres::io::NegotiateSsl;
1212

1313
/// Like `postgres::SslMode` except that it owns its `NegotiateSsl` instance.
@@ -90,8 +90,10 @@ impl PostgresConnectionManager {
9090
///
9191
/// See `postgres::Connection::connect` for a description of the parameter
9292
/// types.
93-
pubfnnew<T:IntoConnectParams>(params:T,ssl_mode:SslMode)
94-
->Result<PostgresConnectionManager, postgres::error::ConnectError>{
93+
pubfnnew<T:IntoConnectParams>
94+
(params:T,
95+
ssl_mode:SslMode)
96+
->Result<PostgresConnectionManager, postgres::error::ConnectError>{
9597
let params =match params.into_connect_params(){
9698
Ok(params) => params,
9799
Err(err) =>returnErr(postgres::error::ConnectError::ConnectParams(err)),

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp