Skip to content

Commit

Permalink
servo: Merge #10857 - Simplify TOML syntax (from servo:toml); r=nox
Browse files Browse the repository at this point in the history
* 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: rust-lang/cargo#2328

Source-Repo: /~https://github.com/servo/servo
Source-Revision: 2729864af73d62719ea0fd55cef417c43bdd951e

UltraBlame original commit: 6710bf1dbafec084574fd82064e1f7896091bacf
  • Loading branch information
marco-c committed Oct 1, 2019
1 parent 756a4ee commit 8b62f7d
Show file tree
Hide file tree
Showing 36 changed files with 1,066 additions and 2,031 deletions.
51 changes: 22 additions & 29 deletions servo/components/canvas/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ rs
"
[
dependencies
.
azure
]
azure
=
{
git
=
"
Expand All @@ -72,11 +73,10 @@ features
plugins
"
]
[
dependencies
.
}
canvas_traits
]
=
{
path
=
"
Expand All @@ -85,11 +85,10 @@ path
/
canvas_traits
"
[
dependencies
.
}
plugins
]
=
{
path
=
"
Expand All @@ -98,11 +97,10 @@ path
/
plugins
"
[
dependencies
.
}
util
]
=
{
path
=
"
Expand All @@ -111,11 +109,10 @@ path
/
util
"
[
dependencies
.
}
gfx_traits
]
=
{
path
=
"
Expand All @@ -124,13 +121,12 @@ path
/
gfx_traits
"
[
dependencies
.
}
ipc
-
channel
]
=
{
git
=
"
Expand All @@ -148,11 +144,10 @@ ipc
-
channel
"
[
dependencies
.
}
webrender_traits
]
=
{
git
=
"
Expand All @@ -168,9 +163,7 @@ servo
/
webrender_traits
"
[
dependencies
]
}
euclid
=
{
Expand Down
44 changes: 19 additions & 25 deletions servo/components/canvas_traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ rs
"
[
dependencies
.
gfx_traits
]
gfx_traits
=
{
path
=
"
Expand All @@ -56,11 +57,10 @@ path
/
gfx_traits
"
[
dependencies
.
}
azure
]
=
{
git
=
"
Expand All @@ -85,13 +85,12 @@ features
plugins
"
]
[
dependencies
.
}
ipc
-
channel
]
=
{
git
=
"
Expand All @@ -109,11 +108,10 @@ ipc
-
channel
"
[
dependencies
.
}
serde
]
=
{
version
=
"
Expand All @@ -128,11 +126,10 @@ features
nightly
"
]
[
dependencies
.
}
plugins
]
=
{
path
=
"
Expand All @@ -141,11 +138,10 @@ path
/
plugins
"
[
dependencies
.
}
webrender_traits
]
=
{
git
=
"
Expand All @@ -161,9 +157,7 @@ servo
/
webrender_traits
"
[
dependencies
]
}
cssparser
=
{
Expand Down
Loading

0 comments on commit 8b62f7d

Please sign in to comment.