From cb4694387e56627d1ffc982bad3a370f6ddef866 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 9 Jun 2016 01:06:21 -0700 Subject: [PATCH 1/3] Fix nightly check in serde-syntex-example --- examples/serde-syntex-example/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/serde-syntex-example/src/main.rs b/examples/serde-syntex-example/src/main.rs index 9c2333fb..0a8804ab 100644 --- a/examples/serde-syntex-example/src/main.rs +++ b/examples/serde-syntex-example/src/main.rs @@ -1,5 +1,5 @@ -#![cfg_attr(nightly, feature(custom_derive, plugin))] -#![cfg_attr(nightly, plugin(serde_macros))] +#![cfg_attr(feature = "serde_macros", feature(custom_derive, plugin))] +#![cfg_attr(feature = "serde_macros", plugin(serde_macros))] extern crate serde; extern crate serde_json; From e90adb20ef94d7e0f4f7ae38d3d4d429999c86c9 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 9 Jun 2016 01:42:00 -0700 Subject: [PATCH 2/3] Run serde-syntex-example in Travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0b7cf31c..a98baf6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,8 @@ script: - (cd serde_tests && travis-cargo --only nightly test -- --features nightly-testing) - (cd serde_macros && travis-cargo --only nightly test -- --features nightly-testing) - (cd serde_macros && travis-cargo --only nightly bench -- --features nightly-testing) +- (cd examples/serde-syntex-example && travis-cargo run) +- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --features nightly --no-default-features) - (cd serde && travis-cargo --only stable doc) - (cd serde_codegen && travis-cargo --only stable doc) - (cd serde_macros && travis-cargo --only nightly doc) From 898b346d4809e6a0ec92119db4b1ae98a577198b Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 9 Jun 2016 09:17:21 -0700 Subject: [PATCH 3/3] 1.5 does not have a stable libcore --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a98baf6a..c064811d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ script: - (cd serde_tests && travis-cargo --only nightly test -- --features nightly-testing) - (cd serde_macros && travis-cargo --only nightly test -- --features nightly-testing) - (cd serde_macros && travis-cargo --only nightly bench -- --features nightly-testing) -- (cd examples/serde-syntex-example && travis-cargo run) +- (cd examples/serde-syntex-example && travis-cargo --skip 1.5.0 run) - (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --features nightly --no-default-features) - (cd serde && travis-cargo --only stable doc) - (cd serde_codegen && travis-cargo --only stable doc)