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

Merge branch 'v0.6.x'

Browse Source 
# Conflicts:
#	serde/src/de/mod.rs
#	serde_codegen/src/attr.rs
#	serde_codegen/src/de.rs
#	serde_codegen/src/lib.rs
This commit is contained in:
Erick Tryzelaar
2016-02-12 21:43:23 -08:00
parent c3f15fd7f8 064241f03c
commit 561a373d19
9 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_tests/Cargo.toml
+6 -6
View File
@@ -14,18 +14,18 @@ build = "build.rs"
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
[build-dependencies]
syntex = { version = "^0.26.0" }
syntex_syntax = { version = "^0.26.0" }
serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
syntex = { version = "^0.27.0" }
syntex_syntax = { version = "^0.27.0" }
serde_codegen = { version = "^0.6.12", path = "../serde_codegen", features = ["with-syntex"] }
[dev-dependencies]
num = "^0.1.27"
num = "^0.1.26"
rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde", features = ["num-impls"] }
syntex = "^0.26.0"
syntex = "^0.27.0"
[dependencies]
clippy = { version = "^0.0.37", optional = true }
clippy = { version = "^0.0.39", optional = true }
[[test]]
name = "test"
serde_tests/tests/test_de.rs
+1 -1
View File
@@ -8,7 +8,7 @@ use num::rational::Ratio;
use serde::de::{Deserializer, Visitor};
use token::{Error, Token, assert_de_tokens, assert_de_tokens_ignore};
use token::{Token, assert_de_tokens, assert_de_tokens_ignore};
//////////////////////////////////////////////////////////////////////////