Merge remote-tracking branch 'serde/master' into map_seq_ser

This commit is contained in:
Oliver Schneider
2016-07-15 10:59:46 +02:00
7 changed files with 60 additions and 13 deletions
+3 -3
View File
@@ -14,13 +14,13 @@ build = "build.rs"
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
[build-dependencies]
serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
serde_codegen = { version = "*", features = ["with-syntex"] }
[dev-dependencies]
fnv = "1.0"
rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde" }
serde_test = { version = "*", path = "../serde_test" }
serde = "*"
serde_test = "*"
[dependencies]
clippy = { version = "^0.*", optional = true }