From 77b8a8baa0d1407ed5002e6f2767b22041874917 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Wed, 22 Jul 2015 09:51:19 -0700 Subject: [PATCH 1/2] Use new travis containers --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index be6b9832..5dc8f952 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: rust rust: - stable From f56976db1d2e3ca70b1e6bc2f6fbb2fe2f886250 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Wed, 22 Jul 2015 10:40:06 -0700 Subject: [PATCH 2/2] Fix running serde_tests with nightly cargo --- serde_codegen/Cargo.toml | 2 +- serde_tests/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index 968ca3a6..ec39afd3 100644 --- a/serde_codegen/Cargo.toml +++ b/serde_codegen/Cargo.toml @@ -10,7 +10,7 @@ build = "build.rs" [features] default = ["with-syntex"] nightly = ["quasi_macros"] -with-syntex = ["quasi/with-syntex", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] +with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] [build-dependencies] quasi_codegen = { verision = "*", optional = true } diff --git a/serde_tests/Cargo.toml b/serde_tests/Cargo.toml index ae021611..461ce363 100644 --- a/serde_tests/Cargo.toml +++ b/serde_tests/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["serialization"] build = "build.rs" [build-dependencies] -syntex = { version = "*", optional = true } +syntex = { version = "*" } syntex_syntax = { version = "*" } serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }