Skip to content

Commit

Permalink
servo: Merge #8446 - Rust upgrade to rustc 1.6.0-nightly (5b4986fa5 2…
Browse files Browse the repository at this point in the history
…015-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
  • Loading branch information
marco-c committed Oct 1, 2019
1 parent 822613c commit 7403191
Show file tree
Hide file tree
Showing 58 changed files with 4,595 additions and 2,341 deletions.
30 changes: 9 additions & 21 deletions servo/components/compositing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -349,25 +349,6 @@ texture_surface
[
dependencies
.
url
]
version
=
"
0
.
2
"
features
=
[
"
serde_serialization
"
]
[
dependencies
.
gaol
]
git
Expand Down Expand Up @@ -411,7 +392,7 @@ image
"
0
.
4
5
.
0
"
Expand All @@ -420,7 +401,7 @@ libc
"
0
.
1
2
"
log
=
Expand Down Expand Up @@ -486,6 +467,13 @@ serde_macros
.
6
"
url
=
"
0
.
5
"
[
target
.
Expand Down
43 changes: 15 additions & 28 deletions servo/components/devtools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,6 @@ rs
[
dependencies
.
hyper
]
version
=
"
0
.
6
"
features
=
[
"
serde
-
serialization
"
]
[
dependencies
.
devtools_traits
]
path
Expand Down Expand Up @@ -139,26 +118,27 @@ channel
"
[
dependencies
.
url
]
hyper
=
{
version
=
"
0
.
2
7
"
features
=
[
"
serde_serialization
serde
-
serialization
"
]
[
dependencies
]
}
log
=
"
Expand Down Expand Up @@ -196,3 +176,10 @@ serde_macros
.
6
"
url
=
"
0
.
5
"
67 changes: 27 additions & 40 deletions servo/components/devtools_traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,6 @@ rs
[
dependencies
.
hyper
]
version
=
"
0
.
6
"
features
=
[
"
serde
-
serialization
"
]
[
dependencies
.
msg
]
path
Expand All @@ -90,25 +69,6 @@ util
[
dependencies
.
url
]
version
=
"
0
.
2
"
features
=
[
"
serde_serialization
"
]
[
dependencies
.
ipc
-
channel
Expand Down Expand Up @@ -146,6 +106,26 @@ plugins
[
dependencies
]
hyper
=
{
version
=
"
0
.
7
"
features
=
[
"
serde
-
serialization
"
]
}
time
=
"
Expand Down Expand Up @@ -183,3 +163,10 @@ serde_macros
.
6
"
url
=
"
0
.
5
"
28 changes: 8 additions & 20 deletions servo/components/gfx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ libc
"
0
.
1
2
"
log
=
Expand Down Expand Up @@ -196,6 +196,13 @@ harfbuzz
"
]
}
url
=
"
0
.
5
"
[
dependencies
.
Expand Down Expand Up @@ -416,25 +423,6 @@ ipc
channel
"
[
dependencies
.
url
]
version
=
"
0
.
2
"
features
=
[
"
serde_serialization
"
]
[
target
.
x86_64
Expand Down
19 changes: 2 additions & 17 deletions servo/components/gfx/paint_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,21 +301,6 @@ gfx_traits
color
;
use
libc
:
:
types
:
:
common
:
:
c99
:
:
uint32_t
;
use
msg
:
:
Expand Down Expand Up @@ -14694,7 +14679,7 @@ id
(
)
as
uint32_t
u32
mPosition
:
struct__AzPoint
Expand Down Expand Up @@ -14802,7 +14787,7 @@ mNumGlyphs
:
azglyph_buf_len
as
uint32_t
u32
}
;
unsafe
Expand Down
28 changes: 8 additions & 20 deletions servo/components/layout/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -297,25 +297,6 @@ channel
"
[
dependencies
.
url
]
version
=
"
0
.
2
"
features
=
[
"
serde_serialization
"
]
[
dependencies
]
app_units
=
Expand Down Expand Up @@ -397,7 +378,7 @@ libc
"
0
.
1
2
"
selectors
=
Expand Down Expand Up @@ -488,3 +469,10 @@ harfbuzz
"
]
}
url
=
"
0
.
5
"
26 changes: 7 additions & 19 deletions servo/components/layout_traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -144,25 +144,6 @@ channel
"
[
dependencies
.
url
]
version
=
"
0
.
2
"
features
=
[
"
serde_serialization
"
]
[
dependencies
]
euclid
=
Expand Down Expand Up @@ -196,3 +177,10 @@ serde_macros
.
6
"
url
=
"
0
.
5
"
Loading

0 comments on commit 7403191

Please sign in to comment.