Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions json_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ build = "build.rs"

[features]
default = ["serde_macros"]
with-syntex = ["syntex", "serde_codegen"]
with-syntex = ["syntex", "serde_codegen", "indoc/with-syntex"]
nightly-testing = ["clippy", "serde_json/clippy"]

[build-dependencies]
syntex = { version = "*", optional = true }
indoc = "*"
serde_codegen = { version = "*", optional = true }
skeptic = "^0.4.0"
syntex = { version = "*", optional = true }

[dependencies]
clippy = { version = "^0.*", optional = true }
indoc = "*"
num = "*"
rustc-serialize = "*"
serde = "*"
Expand Down
2 changes: 1 addition & 1 deletion json_tests/benches/bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#![cfg_attr(feature = "nightly-testing", plugin(clippy))]

#![cfg_attr(not(feature = "with-syntex"), feature(custom_attribute, custom_derive, plugin))]
#![cfg_attr(not(feature = "with-syntex"), plugin(serde_macros))]
#![cfg_attr(not(feature = "with-syntex"), plugin(serde_macros, indoc))]

#![feature(test)]

Expand Down
2 changes: 2 additions & 0 deletions json_tests/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ extern crate skeptic;
mod with_syntex {
extern crate syntex;
extern crate serde_codegen;
extern crate indoc;

use std::env;
use std::path::Path;
Expand All @@ -21,6 +22,7 @@ mod with_syntex {
let mut registry = syntex::Registry::new();

serde_codegen::register(&mut registry);
indoc::register(&mut registry);
registry.expand("", &src, &dst).unwrap();
}
}
Expand Down
2 changes: 1 addition & 1 deletion json_tests/tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#![cfg_attr(feature = "nightly-testing", plugin(clippy))]

#![cfg_attr(not(feature = "with-syntex"), feature(custom_attribute, custom_derive, plugin))]
#![cfg_attr(not(feature = "with-syntex"), plugin(serde_macros))]
#![cfg_attr(not(feature = "with-syntex"), plugin(serde_macros, indoc))]

extern crate serde;
extern crate serde_json;
Expand Down
Loading