Auto merge of #10857 - servo:toml, r=nox

Simplify TOML syntax

* Sections like `[dependencies.foo]` can be entries in a `[dependencies]` section with the `{key = value}` syntax.
* Per-target dependencies can be expressed with more general `cfg(…)` conditions instead of exact target triples: https://github.com/rust-lang/cargo/pull/2328

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10857)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-26 15:46:37 -07:00
commit 2729864af7
36 changed files with 285 additions and 898 deletions

View file

@ -8,31 +8,15 @@ publish = false
name = "net"
path = "lib.rs"
[dependencies.net_traits]
path = "../net_traits"
[dependencies.util]
path = "../util"
[dependencies.devtools_traits]
path = "../devtools_traits"
[dependencies.brotli]
git = "https://github.com/ende76/brotli-rs"
[dependencies.plugins]
path = "../plugins"
[dependencies.msg]
path = "../msg"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender_traits"
[dependencies]
net_traits = {path = "../net_traits"}
util = {path = "../util"}
devtools_traits = {path = "../devtools_traits"}
brotli = {git = "https://github.com/ende76/brotli-rs"}
plugins = {path = "../plugins"}
msg = {path = "../msg"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
webrender_traits = {git = "https://github.com/servo/webrender_traits"}
cookie = { version = "0.2.4", features = [ "serialize-rustc" ] }
flate2 = "0.2.0"
hyper = { version = "0.9", features = [ "serde-serialization" ] }