Skip to content

Commit 8b62f7d

Browse files
committed
servo: Merge #10857 - Simplify TOML syntax (from servo:toml); r=nox
* 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
1 parent 756a4ee commit 8b62f7d

File tree

36 files changed

+1066
-2031
lines changed

36 files changed

+1066
-2031
lines changed

servo/components/canvas/Cargo.toml

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ rs
4545
"
4646
[
4747
dependencies
48-
.
49-
azure
5048
]
49+
azure
50+
=
51+
{
5152
git
5253
=
5354
"
@@ -72,11 +73,10 @@ features
7273
plugins
7374
"
7475
]
75-
[
76-
dependencies
77-
.
76+
}
7877
canvas_traits
79-
]
78+
=
79+
{
8080
path
8181
=
8282
"
@@ -85,11 +85,10 @@ path
8585
/
8686
canvas_traits
8787
"
88-
[
89-
dependencies
90-
.
88+
}
9189
plugins
92-
]
90+
=
91+
{
9392
path
9493
=
9594
"
@@ -98,11 +97,10 @@ path
9897
/
9998
plugins
10099
"
101-
[
102-
dependencies
103-
.
100+
}
104101
util
105-
]
102+
=
103+
{
106104
path
107105
=
108106
"
@@ -111,11 +109,10 @@ path
111109
/
112110
util
113111
"
114-
[
115-
dependencies
116-
.
112+
}
117113
gfx_traits
118-
]
114+
=
115+
{
119116
path
120117
=
121118
"
@@ -124,13 +121,12 @@ path
124121
/
125122
gfx_traits
126123
"
127-
[
128-
dependencies
129-
.
124+
}
130125
ipc
131126
-
132127
channel
133-
]
128+
=
129+
{
134130
git
135131
=
136132
"
@@ -148,11 +144,10 @@ ipc
148144
-
149145
channel
150146
"
151-
[
152-
dependencies
153-
.
147+
}
154148
webrender_traits
155-
]
149+
=
150+
{
156151
git
157152
=
158153
"
@@ -168,9 +163,7 @@ servo
168163
/
169164
webrender_traits
170165
"
171-
[
172-
dependencies
173-
]
166+
}
174167
euclid
175168
=
176169
{

servo/components/canvas_traits/Cargo.toml

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ rs
4545
"
4646
[
4747
dependencies
48-
.
49-
gfx_traits
5048
]
49+
gfx_traits
50+
=
51+
{
5152
path
5253
=
5354
"
@@ -56,11 +57,10 @@ path
5657
/
5758
gfx_traits
5859
"
59-
[
60-
dependencies
61-
.
60+
}
6261
azure
63-
]
62+
=
63+
{
6464
git
6565
=
6666
"
@@ -85,13 +85,12 @@ features
8585
plugins
8686
"
8787
]
88-
[
89-
dependencies
90-
.
88+
}
9189
ipc
9290
-
9391
channel
94-
]
92+
=
93+
{
9594
git
9695
=
9796
"
@@ -109,11 +108,10 @@ ipc
109108
-
110109
channel
111110
"
112-
[
113-
dependencies
114-
.
111+
}
115112
serde
116-
]
113+
=
114+
{
117115
version
118116
=
119117
"
@@ -128,11 +126,10 @@ features
128126
nightly
129127
"
130128
]
131-
[
132-
dependencies
133-
.
129+
}
134130
plugins
135-
]
131+
=
132+
{
136133
path
137134
=
138135
"
@@ -141,11 +138,10 @@ path
141138
/
142139
plugins
143140
"
144-
[
145-
dependencies
146-
.
141+
}
147142
webrender_traits
148-
]
143+
=
144+
{
149145
git
150146
=
151147
"
@@ -161,9 +157,7 @@ servo
161157
/
162158
webrender_traits
163159
"
164-
[
165-
dependencies
166-
]
160+
}
167161
cssparser
168162
=
169163
{

0 commit comments

Comments
 (0)