Skip to content

Commit 7403191

Browse files
marco-cmarco-c
committed
servo: Merge #8446 - Rust upgrade to rustc 1.6.0-nightly (5b4986fa5 2015-11-08) (from servo:rustup_20151110); r=SimonSapin+Ms2ger+jdm+Manishearth
<s>DO NOT r+ or try+ this</s> <s>It causes an OOM (rust-lang/rust#29740) and can crash the OS. Probably will set our CI on fire. </s> Source-Repo: https://github.com/servo/servo Source-Revision: f13c72d68e1e7f49e241938bfd6e8a588c68e86b UltraBlame original commit: cfd63f6ba5819f3029d16d9681de754882ef67b4
1 parent 822613c commit 7403191

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+4595
-2341
lines changed

‎servo/components/compositing/Cargo.toml

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -349,25 +349,6 @@ texture_surface
349349
[
350350
dependencies
351351
.
352-
url
353-
]
354-
version
355-
=
356-
"
357-
0
358-
.
359-
2
360-
"
361-
features
362-
=
363-
[
364-
"
365-
serde_serialization
366-
"
367-
]
368-
[
369-
dependencies
370-
.
371352
gaol
372353
]
373354
git
@@ -411,7 +392,7 @@ image
411392
"
412393
0
413394
.
414-
4
395+
5
415396
.
416397
0
417398
"
@@ -420,7 +401,7 @@ libc
420401
"
421402
0
422403
.
423-
1
404+
2
424405
"
425406
log
426407
=
@@ -486,6 +467,13 @@ serde_macros
486467
.
487468
6
488469
"
470+
url
471+
=
472+
"
473+
0
474+
.
475+
5
476+
"
489477
[
490478
target
491479
.

‎servo/components/devtools/Cargo.toml

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,6 @@ rs
4343
[
4444
dependencies
4545
.
46-
hyper
47-
]
48-
version
49-
=
50-
"
51-
0
52-
.
53-
6
54-
"
55-
features
56-
=
57-
[
58-
"
59-
serde
60-
-
61-
serialization
62-
"
63-
]
64-
[
65-
dependencies
66-
.
6746
devtools_traits
6847
]
6948
path
@@ -139,26 +118,27 @@ channel
139118
"
140119
[
141120
dependencies
142-
.
143-
url
144121
]
122+
hyper
123+
=
124+
{
145125
version
146126
=
147127
"
148128
0
149129
.
150-
2
130+
7
151131
"
152132
features
153133
=
154134
[
155135
"
156-
serde_serialization
136+
serde
137+
-
138+
serialization
157139
"
158140
]
159-
[
160-
dependencies
161-
]
141+
}
162142
log
163143
=
164144
"
@@ -196,3 +176,10 @@ serde_macros
196176
.
197177
6
198178
"
179+
url
180+
=
181+
"
182+
0
183+
.
184+
5
185+
"

‎servo/components/devtools_traits/Cargo.toml

Lines changed: 27 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,6 @@ rs
4343
[
4444
dependencies
4545
.
46-
hyper
47-
]
48-
version
49-
=
50-
"
51-
0
52-
.
53-
6
54-
"
55-
features
56-
=
57-
[
58-
"
59-
serde
60-
-
61-
serialization
62-
"
63-
]
64-
[
65-
dependencies
66-
.
6746
msg
6847
]
6948
path
@@ -90,25 +69,6 @@ util
9069
[
9170
dependencies
9271
.
93-
url
94-
]
95-
version
96-
=
97-
"
98-
0
99-
.
100-
2
101-
"
102-
features
103-
=
104-
[
105-
"
106-
serde_serialization
107-
"
108-
]
109-
[
110-
dependencies
111-
.
11272
ipc
11373
-
11474
channel
@@ -146,6 +106,26 @@ plugins
146106
[
147107
dependencies
148108
]
109+
hyper
110+
=
111+
{
112+
version
113+
=
114+
"
115+
0
116+
.
117+
7
118+
"
119+
features
120+
=
121+
[
122+
"
123+
serde
124+
-
125+
serialization
126+
"
127+
]
128+
}
149129
time
150130
=
151131
"
@@ -183,3 +163,10 @@ serde_macros
183163
.
184164
6
185165
"
166+
url
167+
=
168+
"
169+
0
170+
.
171+
5
172+
"

‎servo/components/gfx/Cargo.toml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ libc
114114
"
115115
0
116116
.
117-
1
117+
2
118118
"
119119
log
120120
=
@@ -196,6 +196,13 @@ harfbuzz
196196
"
197197
]
198198
}
199+
url
200+
=
201+
"
202+
0
203+
.
204+
5
205+
"
199206
[
200207
dependencies
201208
.
@@ -416,25 +423,6 @@ ipc
416423
channel
417424
"
418425
[
419-
dependencies
420-
.
421-
url
422-
]
423-
version
424-
=
425-
"
426-
0
427-
.
428-
2
429-
"
430-
features
431-
=
432-
[
433-
"
434-
serde_serialization
435-
"
436-
]
437-
[
438426
target
439427
.
440428
x86_64

‎servo/components/gfx/paint_context.rs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -301,21 +301,6 @@ gfx_traits
301301
color
302302
;
303303
use
304-
libc
305-
:
306-
:
307-
types
308-
:
309-
:
310-
common
311-
:
312-
:
313-
c99
314-
:
315-
:
316-
uint32_t
317-
;
318-
use
319304
msg
320305
:
321306
:
@@ -14694,7 +14679,7 @@ id
1469414679
(
1469514680
)
1469614681
as
14697-
uint32_t
14682+
u32
1469814683
mPosition
1469914684
:
1470014685
struct__AzPoint
@@ -14802,7 +14787,7 @@ mNumGlyphs
1480214787
:
1480314788
azglyph_buf_len
1480414789
as
14805-
uint32_t
14790+
u32
1480614791
}
1480714792
;
1480814793
unsafe

‎servo/components/layout/Cargo.toml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -297,25 +297,6 @@ channel
297297
"
298298
[
299299
dependencies
300-
.
301-
url
302-
]
303-
version
304-
=
305-
"
306-
0
307-
.
308-
2
309-
"
310-
features
311-
=
312-
[
313-
"
314-
serde_serialization
315-
"
316-
]
317-
[
318-
dependencies
319300
]
320301
app_units
321302
=
@@ -397,7 +378,7 @@ libc
397378
"
398379
0
399380
.
400-
1
381+
2
401382
"
402383
selectors
403384
=
@@ -488,3 +469,10 @@ harfbuzz
488469
"
489470
]
490471
}
472+
url
473+
=
474+
"
475+
0
476+
.
477+
5
478+
"

‎servo/components/layout_traits/Cargo.toml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -144,25 +144,6 @@ channel
144144
"
145145
[
146146
dependencies
147-
.
148-
url
149-
]
150-
version
151-
=
152-
"
153-
0
154-
.
155-
2
156-
"
157-
features
158-
=
159-
[
160-
"
161-
serde_serialization
162-
"
163-
]
164-
[
165-
dependencies
166147
]
167148
euclid
168149
=
@@ -196,3 +177,10 @@ serde_macros
196177
.
197178
6
198179
"
180+
url
181+
=
182+
"
183+
0
184+
.
185+
5
186+
"

0 commit comments

Comments
 (0)