Merge pull request #302 from serde-rs/combine

Combine serde_json and tests into one crate

Author: dtolnay

Cargo.toml

@@ -1,5 +1,31 @@
-[workspace]
-members = [
-    "json",
-    "json_tests",
-]
+[package]
+name = "serde_json"
+version = "0.9.10"
+authors = ["Erick Tryzelaar <[email protected]>"]
+license = "MIT/Apache-2.0"
+description = "A JSON serialization file format"
+repository = "https://github.com/serde-rs/json"
+documentation = "http://docs.serde.rs/serde_json/"
+keywords = ["json", "serde", "serialization"]
+categories = ["encoding"]
+readme = "../README.md"
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+publish = false # this branch contains breaking changes
+
+[badges]
+travis-ci = { repository = "serde-rs/json" }
+
+[features]
+preserve_order = ["linked-hash-map"]
+
+[dependencies]
+serde = { git = "https://github.com/serde-rs/serde", branch = "1.0" }
+num-traits = "0.1.32"
+linked-hash-map = { version = "0.4.1", optional = true }
+itoa = "0.3"
+dtoa = "0.4"
+
+[dev-dependencies]
+compiletest_rs = "0.2"
+serde_bytes = { git = "https://github.com/serde-rs/bytes", branch = "1.0" }
+serde_derive = { git = "https://github.com/serde-rs/serde", branch = "1.0" }