Merge branch 'release-v0.1.4' into release

Author: sfackler

.gitignore

@@ -1,3 +1,5 @@
 target/
 Cargo.lock
 .cargo/
+.idea/
+*.iml

.travis.yml

@@ -2,8 +2,7 @@ language: rust
 sudo: false
 rust:
 - nightly
-- beta
-- 1.8.0
+- 1.11.0
 script:
 - (test $TRAVIS_RUST_VERSION != "nightly" || env RUST_BACKTRACE=1 cargo test --manifest-path=postgres-derive-macros/Cargo.toml)
 - cargo test --manifest-path=postgres-derive-codegen/test/Cargo.toml

postgres-derive-codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres-derive-codegen"
-version = "0.1.3"
+version = "0.1.4"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT/Apache-2.0"
 description = "Deriving codegen support for Postgres enum, domain, and composite types"
@@ -16,8 +16,8 @@ nightly = []
 with-syntex = ["syntex", "syntex_syntax"]
 
 [build-dependencies]
-syntex = { version = "0.36", optional = true }
+syntex = { version = "0.44", optional = true }
 
 [dependencies]
-syntex = { version = "0.36", optional = true }
-syntex_syntax = { version = "0.36", optional = true }
+syntex = { version = "0.44", optional = true }
+syntex_syntax = { version = "0.44", optional = true }

postgres-derive-codegen/src/overrides.rs

@@ -1,5 +1,4 @@
-use syntax::ast::{Attribute, LitKind, MetaItemKind};
-use syntax::attr::AttrMetaMethods;
+use syntax::ast::{Attribute, LitKind, MetaItemKind, NestedMetaItemKind};
 use syntax::ext::base::ExtCtxt;
 use syntax::parse::token::InternedString;
 
@@ -21,6 +20,13 @@ pub fn get_overrides(ctx: &mut ExtCtxt, attrs: &[Attribute]) -> Overrides {
             };
 
             for item in list {
+                let item = match item.node {
+                    NestedMetaItemKind::MetaItem(ref item) => item,
+                    _ => {
+                        ctx.span_err(item.span, "expected a meta item");
+                        continue;
+                    }
+                };
                 match item.node {
                     MetaItemKind::NameValue(ref key, ref value) => {
                         if *key != "name" {

postgres-derive-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres-derive-macros"
-version = "0.1.3"
+version = "0.1.4"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT/Apache-2.0"
 description = "Deriving macro support for Postgres enum, domain, and composite types"
@@ -13,8 +13,8 @@ plugin = true
 test = false
 
 [dependencies]
-postgres-derive-codegen = { version = "0.1.3", path = "../postgres-derive-codegen", default-features = false, features = ["nightly"] }
+postgres-derive-codegen = { version = "0.1.4", path = "../postgres-derive-codegen", default-features = false, features = ["nightly"] }
 
 [dev-dependencies]
 postgres = "0.11.3"
-compiletest_rs = "0.1"
+compiletest_rs = "0.2"

postgres-derive-macros/tests/compile-fail/bad-override.rs

@@ -5,7 +5,7 @@ macro_rules! to_sql_checked {
     () => ()
 }
 
-#[derive(ToSql)]
+#[derive(Clone, ToSql)]
 #[postgres(
     foo = "bar" //~ ERROR unknown attribute key `foo`
 )]

postgres-derive-macros/tests/compile-fail/big-tuple-struct.rs

@@ -5,10 +5,10 @@ macro_rules! to_sql_checked {
     () => ()
 }
 
-#[derive(ToSql)] //~ ERROR #[derive(ToSql)] can only be applied to structs, single field tuple structs, and enums
+#[derive(Clone, ToSql)] //~ ERROR #[derive(ToSql)] can only be applied to structs, single field tuple structs, and enums
 struct Foo(i32, i32);
 
-#[derive(FromSql)] //~ ERROR #[derive(FromSql)] can only be applied to structs, single field tuple structs, and enums
+#[derive(Clone, FromSql)] //~ ERROR #[derive(FromSql)] can only be applied to structs, single field tuple structs, and enums
 struct Bar(i32, i32);
 
 fn main() {}

postgres-derive-macros/tests/compile-fail/complex-enum.rs

@@ -5,14 +5,14 @@ macro_rules! to_sql_checked {
     () => ()
 }
 
-#[derive(ToSql)]
+#[derive(Clone, ToSql)]
 enum Foo {
     Bar(i32), //~ ERROR #[derive(ToSql)] does not support non-C-like enums
     Baz { b: i32 }, //~ ERROR #[derive(ToSql)] does not support non-C-like enums
 }
 
-#[derive(FromSql)]
-enum Foo {
+#[derive(Clone, FromSql)]
+enum Bar {
     Bar(i32), //~ ERROR #[derive(FromSql)] does not support non-C-like enums
     Baz { b: i32 }, //~ ERROR #[derive(FromSql)] does not support non-C-like enums
 }