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

@ -17,17 +17,10 @@ path = "lib.rs"
# set this feature.
non-geckolib = ["js"]
[dependencies.plugins]
path = "../plugins"
[dependencies.js]
git = "https://github.com/servo/rust-mozjs"
optional = true
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies]
plugins = {path = "../plugins"}
js = {git = "https://github.com/servo/rust-mozjs", optional = true}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
app_units = {version = "0.2.3", features = ["plugins"]}
backtrace = "0.2.1"
bitflags = "0.3"
@ -49,5 +42,5 @@ smallvec = "0.1"
string_cache = {version = "0.2.12", features = ["heap_size"]}
url = {version = "1.0.0", features = ["heap_size", "serde"]}
[target.x86_64-pc-windows-gnu.dependencies]
[target.'cfg(windows)'.dependencies]
kernel32-sys = "0.2"