pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-15 20:11:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test serde_derive instead of serde_macros

Browse Source
This commit is contained in:
David Tolnay
2016-09-28 11:19:27 -07:00
parent 2a2c098eeb
commit 8b7b886036
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -24,7 +24,7 @@ script:
- (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections) - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
- (cd testing && travis-cargo --skip nightly test) - (cd testing && travis-cargo --skip nightly test)
- (cd testing && travis-cargo --only nightly test -- --features unstable-testing) - (cd testing && travis-cargo --only nightly test -- --features unstable-testing)
- (cd serde_macros && travis-cargo --only nightly test -- --features unstable-testing) - (cd serde_derive && travis-cargo --only nightly test)
- (cd examples/serde-syntex-example && travis-cargo --skip nightly run) - (cd examples/serde-syntex-example && travis-cargo --skip nightly run)
- (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features unstable) - (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features unstable)
- (cd serde && travis-cargo --only stable doc) - (cd serde && travis-cargo --only stable doc)
examples/serde-syntex-example/Cargo.toml
+2 -2
View File
@@ -6,12 +6,12 @@ build = "build.rs"
[features] [features]
default = ["serde_codegen"] default = ["serde_codegen"]
unstable = ["serde_macros"] unstable = ["serde_derive"]
[build-dependencies] [build-dependencies]
serde_codegen = { version = "^0.8", optional = true, path = "../../serde_codegen" } serde_codegen = { version = "^0.8", optional = true, path = "../../serde_codegen" }
[dependencies] [dependencies]
serde = "^0.8" serde = "^0.8"
serde_derive = { version = "^0.8", optional = true, path = "../../serde_derive" }
serde_json = "^0.8" serde_json = "^0.8"
serde_macros = { version = "^0.8", optional = true, path = "../../serde_macros" }
examples/serde-syntex-example/build.rs
+2 -2
View File
@@ -1,4 +1,4 @@
#[cfg(not(feature = "serde_macros"))] #[cfg(not(feature = "serde_derive"))]
mod inner { mod inner {
extern crate serde_codegen; extern crate serde_codegen;
@@ -15,7 +15,7 @@ mod inner {
} }
} }
#[cfg(feature = "serde_macros")] #[cfg(feature = "serde_derive")]
mod inner { mod inner {
pub fn main() {} pub fn main() {}
} }
examples/serde-syntex-example/src/main.rs
+7 -4
View File
@@ -1,11 +1,14 @@
#![cfg_attr(feature = "serde_macros", feature(custom_derive, plugin))] #![cfg_attr(feature = "serde_derive", feature(rustc_macro))]
#![cfg_attr(feature = "serde_macros", plugin(serde_macros))]
#[cfg(feature = "serde_derive")]
#[macro_use]
extern crate serde_derive;
extern crate serde; extern crate serde;
extern crate serde_json; extern crate serde_json;
#[cfg(feature = "serde_macros")] #[cfg(feature = "serde_derive")]
include!("main.rs.in"); include!("main.rs.in");
#[cfg(not(feature = "serde_macros"))] #[cfg(not(feature = "serde_derive"))]
include!(concat!(env!("OUT_DIR"), "/main.rs")); include!(concat!(env!("OUT_DIR"), "/main.rs"));