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 (https://github.com/rust-lang/rust/issues/29740) and can crash the OS. Probably will set our CI on fire. </s>

Source-Repo: https://github.com/servo/servo
Source-Revision: f13c72d68e1e7f49e241938bfd6e8a588c68e86b
This commit is contained in:
Manish Goregaokar
2015-11-27 10:17:00 +05:00
parent 4cdc9c76f9
commit 09d3c7ef66
58 changed files with 1092 additions and 965 deletions

View File

@@ -24,14 +24,6 @@ features = ["plugins"]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]
[dependencies.hyper]
version = "0.6"
features = [ "serde-serialization" ]
[dependencies.url]
version = "0.2.36"
features = [ "serde_serialization" ]
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
@@ -45,10 +37,12 @@ path = "../plugins"
[dependencies]
app_units = {version = "0.1", features = ["plugins"]}
bitflags = "0.3"
hyper = { version = "0.7", features = [ "serde-serialization" ] }
rustc-serialize = "0.3.4"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
url = "0.5"
[target.x86_64-apple-darwin.dependencies]
core-foundation = "0.1"