Skip to content
This repository was archived by the owner on Oct 10, 2019. It is now read-only.

Commit d665ded

Browse files
committed
Merge branch 'release-v0.2.0' into release
2 parents b13bbad + acfe890 commit d665ded

34 files changed

+767
-758
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ rust:
44
- nightly
55
- 1.11.0
66
script:
7-
- (test $TRAVIS_RUST_VERSION != "nightly" || env RUST_BACKTRACE=1 cargo test --manifest-path=postgres-derive-macros/Cargo.toml)
7+
- (test $TRAVIS_RUST_VERSION != "nightly" || env RUST_BACKTRACE=1 cargo test --manifest-path=postgres-derive/Cargo.toml)
88
- cargo test --manifest-path=postgres-derive-codegen/test/Cargo.toml

Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[workspace]
2+
members = [
3+
"postgres-derive",
4+
"postgres-derive-codegen",
5+
"postgres-derive-codegen/test",
6+
"postgres-derive-internals"
7+
]

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Syntax extensions to automatically derive `FromSql` and `ToSql` implementations for Postgres enum,
66
domain, and composite types.
77

8-
The generated code requires rust-postgres 0.11.3 or higher and Rust 1.8.0 or higher.
8+
The generated code requires rust-postgres 0.12.0 or higher and Rust 1.10.0 or higher.
99

1010
# Usage
1111

@@ -22,17 +22,18 @@ Cargo.toml
2222
# ...
2323

2424
[dependencies]
25-
postgres-derive-macros = "0.1"
26-
postgres = "0.11.3"
25+
postgres-derive-macros = "0.2"
26+
postgres = "0.12"
2727
```
2828

2929
lib.rs
3030
```rust
31-
#![feature(plugin, custom_derive)]
32-
#![plugin(postgres_derive_macros)]
31+
#![feature(proc_macro)]
3332

3433
#[macro_use]
3534
extern crate postgres;
35+
#[macro_use]
36+
extern crate postgres_derive;
3637

3738
#[derive(Debug, ToSql, FromSql)]
3839
pub enum Mood {
@@ -55,10 +56,10 @@ Cargo.toml
5556
build = "build.rs"
5657

5758
[build-dependencies]
58-
postgres-derive-codegen = "0.1"
59+
postgres-derive-codegen = "0.2"
5960

6061
[dependencies]
61-
postgres = "0.11.3"
62+
postgres = "0.12"
6263
```
6364

6465
build.rs

postgres-derive-codegen/Cargo.toml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
[package]
22
name = "postgres-derive-codegen"
3-
version = "0.1.4"
3+
version = "0.2.0"
44
authors = ["Steven Fackler <[email protected]>"]
55
license = "MIT/Apache-2.0"
66
description = "Deriving codegen support for Postgres enum, domain, and composite types"
77
repository = "https://github.com/sfackler/rust-postgres-derive"
88
readme = "../README.md"
99
keywords = ["database", "postgres", "postgresql", "sql"]
10-
build = "build.rs"
1110
exclude = ["test"]
1211

13-
[features]
14-
default = ["with-syntex"]
15-
nightly = []
16-
with-syntex = ["syntex", "syntex_syntax"]
17-
18-
[build-dependencies]
19-
syntex = { version = "0.44", optional = true }
20-
2112
[dependencies]
22-
syntex = { version = "0.44", optional = true }
23-
syntex_syntax = { version = "0.44", optional = true }
13+
syntex = "0.44"
14+
syntex_syntax = "0.44"
15+
postgres-derive-internals = { version = "0.2.0", path = "../postgres-derive-internals" }

postgres-derive-codegen/build.rs

Lines changed: 0 additions & 27 deletions
This file was deleted.

postgres-derive-codegen/src/accepts.rs

Lines changed: 0 additions & 73 deletions
This file was deleted.

postgres-derive-codegen/src/enums.rs

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)