diff --git a/testing/Cargo.toml b/testing/Cargo.toml index 184cb7fa..9ad1333f 100644 --- a/testing/Cargo.toml +++ b/testing/Cargo.toml @@ -9,19 +9,16 @@ repository = "https://github.com/serde-rs/serde" documentation = "https://docs.serde.rs/serde/" readme = "README.md" keywords = ["serialization"] -build = "build.rs" publish = false [features] -unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"] - -[build-dependencies] -serde_codegen = { path = "../serde_codegen", features = ["with-syntex"] } +unstable-testing = ["clippy", "serde/unstable-testing", "serde_derive/unstable-testing"] [dev-dependencies] fnv = "1.0" rustc-serialize = "0.3.16" serde = { path = "../serde" } +serde_derive = { path = "../serde_derive" } serde_test = { path = "../serde_test" } [dependencies] diff --git a/testing/build.rs b/testing/build.rs deleted file mode 100644 index bf4a763b..00000000 --- a/testing/build.rs +++ /dev/null @@ -1,11 +0,0 @@ -extern crate serde_codegen; - -use std::env; -use std::path::Path; - -fn main() { - let out_dir = env::var_os("OUT_DIR").unwrap(); - let src = Path::new("tests/test.rs.in"); - let dst = Path::new(&out_dir).join("test.rs"); - serde_codegen::expand(&src, &dst).unwrap(); -} diff --git a/testing/tests/test.rs b/testing/tests/test.rs index 03bb0a68..f7483c2f 100644 --- a/testing/tests/test.rs +++ b/testing/tests/test.rs @@ -3,4 +3,18 @@ #![cfg_attr(feature = "unstable-testing", feature(non_ascii_idents))] -include!(concat!(env!("OUT_DIR"), "/test.rs")); +#[macro_use] +extern crate serde_derive; + +extern crate serde; +extern crate serde_test; + +#[macro_use] +mod macros; + +mod test_annotations; +mod test_bytes; +mod test_de; +mod test_gen; +mod test_macros; +mod test_ser; diff --git a/testing/tests/test.rs.in b/testing/tests/test.rs.in deleted file mode 100644 index 04c69bdb..00000000 --- a/testing/tests/test.rs.in +++ /dev/null @@ -1,12 +0,0 @@ -extern crate serde; -extern crate serde_test; - -#[macro_use] -mod macros; - -mod test_annotations; -mod test_bytes; -mod test_de; -mod test_gen; -mod test_macros; -mod test_ser;