Merge branch 'release-v0.9.1' into release

This commit is contained in:
Steven Fackler 2015-05-30 12:44:46 -07:00
commit 974c48bd7c
3 changed files with 17 additions and 7 deletions

View File

@ -1,11 +1,11 @@
[package] [package]
name = "postgres" name = "postgres"
version = "0.9.0" version = "0.9.1"
authors = ["Steven Fackler <sfackler@gmail.com>"] authors = ["Steven Fackler <sfackler@gmail.com>"]
license = "MIT" license = "MIT"
description = "A native PostgreSQL driver" description = "A native PostgreSQL driver"
repository = "https://github.com/sfackler/rust-postgres" repository = "https://github.com/sfackler/rust-postgres"
documentation = "https://sfackler.github.io/rust-postgres/doc/v0.9.0/postgres" documentation = "https://sfackler.github.io/rust-postgres/doc/v0.9.1/postgres"
readme = "README.md" readme = "README.md"
keywords = ["database", "sql"] keywords = ["database", "sql"]
build = "build.rs" build = "build.rs"

View File

@ -1,7 +1,7 @@
# Rust-Postgres # Rust-Postgres
A native PostgreSQL driver for Rust. A native PostgreSQL driver for Rust.
Documentation is available at https://sfackler.github.io/rust-postgres/doc/v0.8.9/postgres Documentation is available at https://sfackler.github.io/rust-postgres/doc/v0.9.1/postgres
[![Build Status](https://travis-ci.org/sfackler/rust-postgres.png?branch=master)](https://travis-ci.org/sfackler/rust-postgres) [![Latest Version](https://img.shields.io/crates/v/postgres.svg)](https://crates.io/crates/postgres) [![Build Status](https://travis-ci.org/sfackler/rust-postgres.png?branch=master)](https://travis-ci.org/sfackler/rust-postgres) [![Latest Version](https://img.shields.io/crates/v/postgres.svg)](https://crates.io/crates/postgres)
@ -9,7 +9,7 @@ You can integrate Rust-Postgres into your project through the [releases on crate
```toml ```toml
# Cargo.toml # Cargo.toml
[dependencies] [dependencies]
postgres = "0.8" postgres = "0.9"
``` ```
## Overview ## Overview

View File

@ -42,7 +42,7 @@
//! } //! }
//! } //! }
//! ``` //! ```
#![doc(html_root_url="https://sfackler.github.io/rust-postgres/doc/v0.9.0")] #![doc(html_root_url="https://sfackler.github.io/rust-postgres/doc/v0.9.1")]
#![warn(missing_docs)] #![warn(missing_docs)]
extern crate bufstream; extern crate bufstream;
@ -467,9 +467,19 @@ pub enum SslMode {
/// The connection will not use SSL. /// The connection will not use SSL.
None, None,
/// The connection will use SSL if the backend supports it. /// The connection will use SSL if the backend supports it.
Prefer(Box<NegotiateSsl>), Prefer(Box<NegotiateSsl+std::marker::Sync+Send>),
/// The connection must use SSL. /// The connection must use SSL.
Require(Box<NegotiateSsl>), Require(Box<NegotiateSsl+std::marker::Sync+Send>),
}
impl fmt::Debug for SslMode {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
match *self {
SslMode::None => fmt.write_str("None"),
SslMode::Prefer(..) => fmt.write_str("Prefer"),
SslMode::Require(..) => fmt.write_str("Require"),
}
}
} }
#[derive(Clone)] #[derive(Clone)]