Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-10 07:55:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
tests/compiletest/helper/Cargo.toml
View file

@ -8,5 +8,5 @@ name = "compiletest_helper"
path = "lib.rs"
doctest = false
[dependencies.compiletest_rs]
compiletest_rs = "0.11"
[dependencies]
compiletest_rs = "0.1.1"

12
tests/compiletest/plugin/Cargo.toml
View file

@ -8,11 +8,7 @@ name = "plugin_compiletest"
path = "lib.rs"
doctest = false
[dependencies.compiletest_helper]
path = "../helper"
[dependencies.plugins]
path = "../../../components/plugins"
[dependencies.script]
path = "../../../components/script"
[dependencies]
compiletest_helper = {path = "../helper"}
plugins = {path = "../../../components/plugins"}
script = {path = "../../../components/script"}

12
tests/unit/gfx/Cargo.toml
View file

@ -8,11 +8,7 @@ name = "gfx_tests"
path = "lib.rs"
doctest = false
[dependencies.gfx]
path = "../../../components/gfx"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.style]
path = "../../../components/style"
[dependencies]
gfx = {path = "../../../components/gfx"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
style = {path = "../../../components/style"}

4
tests/unit/layout/Cargo.toml
View file

@ -8,5 +8,5 @@ name = "layout_tests"
path = "lib.rs"
doctest = false
[dependencies.layout]
path = "../../../components/layout"
[dependencies]
layout = {path = "../../../components/layout"}

28
tests/unit/net/Cargo.toml
View file

@ -8,28 +8,14 @@ name = "net_tests"
path = "lib.rs"
doctest = false
[dependencies.net]
path = "../../../components/net"
[dependencies.net_traits]
path = "../../../components/net_traits"
[dependencies.util]
path = "../../../components/util"
[dependencies.msg]
path = "../../../components/msg"
[dependencies.plugins]
path = "../../../components/plugins"
[dependencies.devtools_traits]
path = "../../../components/devtools_traits"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies]
net = {path = "../../../components/net"}
net_traits = {path = "../../../components/net_traits"}
util = {path = "../../../components/util"}
msg = {path = "../../../components/msg"}
plugins = {path = "../../../components/plugins"}
devtools_traits = {path = "../../../components/devtools_traits"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
cookie = "0.2"
hyper = "0.9"
url = {version = "1.0.0", features = ["heap_size"]}

4
tests/unit/net_traits/Cargo.toml
View file

@ -8,5 +8,5 @@ name = "net_traits_tests"
path = "lib.rs"
doctest = false
[dependencies.net_traits]
path = "../../../components/net_traits"
[dependencies]
net_traits = {path = "../../../components/net_traits"}

8
tests/unit/profile/Cargo.toml
View file

@ -8,8 +8,6 @@ name = "profile_tests"
path = "lib.rs"
doctest = false
[dependencies.profile]
path = "../../../components/profile"
[dependencies.profile_traits]
path = "../../../components/profile_traits"
[dependencies]
profile = {path = "../../../components/profile"}
profile_traits = {path = "../../../components/profile_traits"}

16
tests/unit/script/Cargo.toml
View file

@ -8,17 +8,9 @@ name = "script_tests"
path = "lib.rs"
doctest = false
[dependencies.msg]
path = "../../../components/msg"
[dependencies.plugins]
path = "../../../components/plugins"
[dependencies.script]
path = "../../../components/script"
[dependencies.util]
path = "../../../components/util"
[dependencies]
msg = {path = "../../../components/msg"}
plugins = {path = "../../../components/plugins"}
script = {path = "../../../components/script"}
util = {path = "../../../components/util"}
url = {version = "1.0.0", features = ["heap_size"]}

20
tests/unit/style/Cargo.toml
View file

@ -8,22 +8,12 @@ name = "style_tests"
path = "lib.rs"
doctest = false
[dependencies.msg]
path = "../../../components/msg"
[dependencies.plugins]
path = "../../../components/plugins"
[dependencies.style]
path = "../../../components/style"
[dependencies.style_traits]
path = "../../../components/style_traits"
[dependencies.util]
path = "../../../components/util"
[dependencies]
msg = {path = "../../../components/msg"}
plugins = {path = "../../../components/plugins"}
style = {path = "../../../components/style"}
style_traits = {path = "../../../components/style_traits"}
util = {path = "../../../components/util"}
app_units = {version = "0.2.3", features = ["plugins"]}
cssparser = {version = "0.5.4", features = ["heap_size"]}
euclid = {version = "0.6.4", features = ["plugins"]}

10
tests/unit/util/Cargo.toml
View file

@ -8,15 +8,9 @@ name = "util_tests"
path = "lib.rs"
doctest = false
[dependencies.util]
path = "../../../components/util"
[dependencies.plugins]
path = "../../../components/plugins"
[dependencies]
util = {path = "../../../components/util"}
plugins = {path = "../../../components/plugins"}
app_units = {version = "0.2.3", features = ["plugins"]}
euclid = {version = "0.6.4", features = ["plugins"]}
libc = "0.2"