Auto merge of #7099 - pcwalton:bincode, r=jdm

servo: Update `ipc-channel` to pick up `bincode` support.

Large improvement in page load times, especially in debug builds.

r? @jdm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7099)
<!-- Reviewable:end -->

18 files changed, 277 insertions, 167 deletions

diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index bd0a53301ac..c08b64afc27 100644
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@@ -23,7 +23,7 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
 git = "https://github.com/pcwalton/ipc-channel"
 
 [dependencies.serde]
-version = "0.4"
+version = "0.5"
 features = [ "nightly" ]
 
 [dependencies.cssparser]
@@ -32,5 +32,5 @@ features = [ "serde-serialization" ]
 
 [dependencies]
 euclid = "0.1"
-serde_macros = "0.4"
+serde_macros = "0.5"
 
diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml
index d66dfe41329..0c794bd11b3 100644
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@@ -31,6 +31,6 @@ features = [ "serde_serialization" ]
 log = "0.3"
 time = "0.1"
 rustc-serialize = "0.3"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
 
diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml
index cb3d93fd30c..4df8fdb14ee 100644
--- a/components/devtools_traits/Cargo.toml
+++ b/components/devtools_traits/Cargo.toml
@@ -28,6 +28,6 @@ git = "https://github.com/pcwalton/ipc-channel"
 time = "0.1"
 rustc-serialize = "0.3"
 bitflags = "0.3"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
 
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index a776bc2f709..078cca78610 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -18,8 +18,8 @@ libc = "0.1"
 log = "0.3"
 rand = "0.3"
 rustc-serialize = "0.3"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
 smallvec = "0.1"
 string_cache = "0.1"
 time = "0.1.12"
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index d1ed4e112ad..54bf5ba18eb 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -77,6 +77,7 @@ smallvec = "0.1"
 string_cache = "0.1"
 string_cache_plugin = "0.1"
 euclid = "0.1"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
+serde_json = "0.5"
 unicode-bidi = "0.2"
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index a2278179885..38653037f6b 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -61,7 +61,7 @@ use script::layout_interface::{ScriptLayoutChan, ScriptReflow, TrustedNodeAddres
 use script_traits::{ConstellationControlMsg, LayoutControlMsg, OpaqueScriptLayoutChannel};
 use script_traits::{ScriptControlChan, StylesheetLoadResponder};
 use selectors::parser::PseudoElement;
-use serde::json;
+use serde_json;
 use std::borrow::ToOwned;
 use std::cell::Cell;
 use std::collections::HashMap;
@@ -1061,7 +1061,7 @@ impl LayoutTask {
                     stacking_context.print("#".to_owned());
                 }
                 if opts::get().dump_display_list_json {
-                    println!("{}", json::to_string_pretty(&stacking_context).unwrap());
+                    println!("{}", serde_json::to_string_pretty(&stacking_context).unwrap());
                 }
 
                 rw_data.stacking_context = Some(stacking_context.clone());
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 61b903df1c2..a96b3104e83 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -57,6 +57,7 @@ extern crate script;
 extern crate script_traits;
 extern crate selectors;
 extern crate serde;
+extern crate serde_json;
 extern crate smallvec;
 extern crate string_cache;
 extern crate style;
diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml
index 355a5ddc265..9c4908e984f 100644
--- a/components/layout_traits/Cargo.toml
+++ b/components/layout_traits/Cargo.toml
@@ -34,6 +34,6 @@ features = [ "serde_serialization" ]
 
 [dependencies]
 euclid = "0.1"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
 
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index 0575608d294..fc4480318a5 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -48,8 +48,8 @@ path = "../plugins"
 bitflags = "0.3"
 rustc-serialize = "0.3.4"
 euclid = "0.1"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
 
 [target.x86_64-apple-darwin.dependencies]
 core-foundation = "0.1"
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index c88b130d41e..9bfff8ba8b0 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -36,5 +36,5 @@ log = "0.3"
 euclid = "0.1"
 regex = "0.1.33"
 regex_macros = "0.1.19"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml
index 6cdf18b2b38..8be871bbc48 100644
--- a/components/profile_traits/Cargo.toml
+++ b/components/profile_traits/Cargo.toml
@@ -15,7 +15,7 @@ version = "0.2"
 features = [ "serde_serialization" ]
 
 [dependencies]
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
 time = "0.1.12"
 
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 97ecdb8e70a..e52594d8c15 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -85,4 +85,4 @@ string_cache_plugin = "0.1"
 euclid = "0.1"
 tendril = "0.1.1"
 rand = "0.3"
-serde = "0.4"
+serde = "0.5"
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml
index ddd29bbb524..bdb460e83dc 100644
--- a/components/script_traits/Cargo.toml
+++ b/components/script_traits/Cargo.toml
@@ -32,6 +32,6 @@ features = [ "serde_serialization" ]
 [dependencies]
 libc = "0.1"
 euclid = "0.1"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
 
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 82c9e6626b6..5b0bd7821f8 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -74,13 +74,24 @@ dependencies = [
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
+name = "bincode"
+version = "0.4.0"
+source = "git+https://github.com/TyOverby/bincode#5bc43b85bcd9290e9ffc519eca32913214c81124"
+dependencies = [
+ "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "bitflags"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -119,8 +130,8 @@ dependencies = [
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -249,7 +260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -276,8 +287,8 @@ dependencies = [
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -292,8 +303,8 @@ dependencies = [
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "msg 0.0.1",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -382,7 +393,7 @@ dependencies = [
  "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -498,11 +509,11 @@ dependencies = [
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -636,7 +647,7 @@ dependencies = [
  "phf_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -668,7 +679,7 @@ dependencies = [
  "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "solicit 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -692,13 +703,14 @@ dependencies = [
 [[package]]
 name = "ipc-channel"
 version = "0.1.0"
-source = "git+https://github.com/pcwalton/ipc-channel#664e96ed6d21b19fe592f8890eb23f8e197107af"
+source = "git+https://github.com/pcwalton/ipc-channel#63a7b00deb5296ff890cc2c7964e039dbd7aeb13"
 dependencies = [
+ "bincode 0.4.0 (git+https://github.com/TyOverby/bincode)",
  "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -779,10 +791,11 @@ dependencies = [
  "script 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -801,8 +814,8 @@ dependencies = [
  "net_traits 0.0.1",
  "profile_traits 0.0.1",
  "script_traits 0.0.1",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
 ]
@@ -898,8 +911,8 @@ dependencies = [
  "plugins 0.0.1",
  "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -954,8 +967,8 @@ dependencies = [
  "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -1001,7 +1014,7 @@ dependencies = [
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1097,7 +1110,7 @@ dependencies = [
  "gcc 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1125,8 +1138,8 @@ name = "profile_traits"
 version = "0.0.1"
 dependencies = [
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1232,9 +1245,9 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "tendril 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1265,8 +1278,8 @@ dependencies = [
  "msg 0.0.1",
  "net_traits 0.0.1",
  "profile_traits 0.0.1",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
 ]
@@ -1282,13 +1295,13 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1296,7 +1309,7 @@ dependencies = [
 
 [[package]]
 name = "serde_codegen"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1305,11 +1318,28 @@ dependencies = [
 ]
 
 [[package]]
+name = "serde_json"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "serde_macros"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_codegen 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_codegen 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_codegen 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1362,11 +1392,11 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_shared 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1407,10 +1437,10 @@ dependencies = [
  "plugins 0.0.1",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -1423,7 +1453,7 @@ dependencies = [
  "cssparser 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1509,7 +1539,7 @@ dependencies = [
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1542,10 +1572,10 @@ dependencies = [
  "plugins 0.0.1",
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 110deb31879..2bac5a5ddb9 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -40,6 +40,6 @@ smallvec = "0.1"
 string_cache = "0.1"
 string_cache_plugin = "0.1"
 euclid = "0.1"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
 
diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml
index e8b5e56f9f6..2796a6e0f35 100644
--- a/components/util/Cargo.toml
+++ b/components/util/Cargo.toml
@@ -49,8 +49,8 @@ smallvec = "0.1"
 num_cpus = "0.2.2"
 num = "0.1.24"
 euclid = "0.1"
-serde = "0.4"
-serde_macros = "0.4"
+serde = "0.5"
+serde_macros = "0.5"
 string_cache = "0.1"
 lazy_static = "0.1"
 getopts = "0.2.11"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 2c9a9ba7d21..540b703e776 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -73,13 +73,24 @@ dependencies = [
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
+name = "bincode"
+version = "0.4.0"
+source = "git+https://github.com/TyOverby/bincode#5bc43b85bcd9290e9ffc519eca32913214c81124"
+dependencies = [
+ "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "bitflags"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -118,8 +129,8 @@ dependencies = [
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -248,7 +259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -275,8 +286,8 @@ dependencies = [
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -291,8 +302,8 @@ dependencies = [
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "msg 0.0.1",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -381,7 +392,7 @@ dependencies = [
  "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -462,6 +473,14 @@ dependencies = [
 ]
 
 [[package]]
+name = "getopts"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "gfx"
 version = "0.0.1"
 dependencies = [
@@ -489,11 +508,11 @@ dependencies = [
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -620,7 +639,7 @@ dependencies = [
  "phf_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -652,7 +671,7 @@ dependencies = [
  "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "solicit 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -676,13 +695,14 @@ dependencies = [
 [[package]]
 name = "ipc-channel"
 version = "0.1.0"
-source = "git+https://github.com/pcwalton/ipc-channel#664e96ed6d21b19fe592f8890eb23f8e197107af"
+source = "git+https://github.com/pcwalton/ipc-channel#63a7b00deb5296ff890cc2c7964e039dbd7aeb13"
 dependencies = [
+ "bincode 0.4.0 (git+https://github.com/TyOverby/bincode)",
  "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -763,10 +783,11 @@ dependencies = [
  "script 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -785,8 +806,8 @@ dependencies = [
  "net_traits 0.0.1",
  "profile_traits 0.0.1",
  "script_traits 0.0.1",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
 ]
@@ -882,8 +903,8 @@ dependencies = [
  "plugins 0.0.1",
  "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -924,8 +945,8 @@ dependencies = [
  "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -971,7 +992,7 @@ dependencies = [
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1067,7 +1088,7 @@ dependencies = [
  "gcc 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1095,8 +1116,8 @@ name = "profile_traits"
 version = "0.0.1"
 dependencies = [
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1202,9 +1223,9 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "tendril 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1227,8 +1248,8 @@ dependencies = [
  "msg 0.0.1",
  "net_traits 0.0.1",
  "profile_traits 0.0.1",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
 ]
@@ -1244,13 +1265,13 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1258,7 +1279,7 @@ dependencies = [
 
 [[package]]
 name = "serde_codegen"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1267,11 +1288,28 @@ dependencies = [
 ]
 
 [[package]]
+name = "serde_json"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "serde_macros"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_codegen 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_codegen 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_codegen 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1350,11 +1388,11 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_shared 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1395,10 +1433,10 @@ dependencies = [
  "plugins 0.0.1",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -1483,7 +1521,7 @@ dependencies = [
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1503,6 +1541,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getopts 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
@@ -1515,10 +1554,10 @@ dependencies = [
  "plugins 0.0.1",
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index c631055038f..7cd3d657a19 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -59,13 +59,24 @@ dependencies = [
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
+name = "bincode"
+version = "0.4.0"
+source = "git+https://github.com/TyOverby/bincode#5bc43b85bcd9290e9ffc519eca32913214c81124"
+dependencies = [
+ "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "bitflags"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -104,8 +115,8 @@ dependencies = [
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -223,7 +234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -250,8 +261,8 @@ dependencies = [
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -266,8 +277,8 @@ dependencies = [
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "msg 0.0.1",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -366,7 +377,7 @@ dependencies = [
  "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -439,6 +450,14 @@ dependencies = [
 ]
 
 [[package]]
+name = "getopts"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "gfx"
 version = "0.0.1"
 dependencies = [
@@ -466,11 +485,11 @@ dependencies = [
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -552,7 +571,7 @@ dependencies = [
  "phf_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -584,7 +603,7 @@ dependencies = [
  "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "solicit 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -608,14 +627,15 @@ dependencies = [
 [[package]]
 name = "ipc-channel"
 version = "0.1.0"
-source = "git+https://github.com/pcwalton/ipc-channel#664e96ed6d21b19fe592f8890eb23f8e197107af"
+source = "git+https://github.com/pcwalton/ipc-channel#63a7b00deb5296ff890cc2c7964e039dbd7aeb13"
 dependencies = [
+ "bincode 0.4.0 (git+https://github.com/TyOverby/bincode)",
  "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -695,10 +715,11 @@ dependencies = [
  "script 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -717,8 +738,8 @@ dependencies = [
  "net_traits 0.0.1",
  "profile_traits 0.0.1",
  "script_traits 0.0.1",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
 ]
@@ -806,8 +827,8 @@ dependencies = [
  "plugins 0.0.1",
  "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -848,8 +869,8 @@ dependencies = [
  "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -886,7 +907,7 @@ dependencies = [
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -973,7 +994,7 @@ dependencies = [
  "gcc 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1001,8 +1022,8 @@ name = "profile_traits"
 version = "0.0.1"
 dependencies = [
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1108,9 +1129,9 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "tendril 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1133,8 +1154,8 @@ dependencies = [
  "msg 0.0.1",
  "net_traits 0.0.1",
  "profile_traits 0.0.1",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
 ]
@@ -1150,13 +1171,13 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1164,7 +1185,7 @@ dependencies = [
 
 [[package]]
 name = "serde_codegen"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1173,11 +1194,28 @@ dependencies = [
 ]
 
 [[package]]
+name = "serde_json"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "serde_macros"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_codegen 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_codegen 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_codegen 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1246,11 +1284,11 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_shared 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1291,10 +1329,10 @@ dependencies = [
  "plugins 0.0.1",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -1379,7 +1417,7 @@ dependencies = [
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1399,6 +1437,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getopts 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
@@ -1411,10 +1450,10 @@ dependencies = [
  "plugins 0.0.1",
  "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_macros 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_macros 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]