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

Merge branch origin/master into origin/enum

Browse Source 
Conflicts:
    serde/src/de/mod.rs
    serde_codegen/src/de.rs
    testing/tests/test_bytes.rs
This commit is contained in:
David Tolnay
2017-01-08 00:23:58 -08:00
parent 85f1bf0259 ad34c14c8c
commit bf873a7b3f
65 changed files with 1933 additions and 4520 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_test/Cargo.toml
+4 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "serde_test"
version = "0.8.4"
version = "0.8.21"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Token De/Serializer for testing De/Serialize implementations"
@@ -11,5 +11,7 @@ readme = "../README.md"
keywords = ["serde", "serialization"]
include = ["Cargo.toml", "src/**/*.rs"]
publish = false # this branch contains breaking changes for 0.9
[dependencies]
serde = { version = "0.8.4", path = "../serde" }
serde = { version = "0.8.21", path = "../serde" }