servo: Merge #17355 - Bump serde to 1.0 (from servo:serdeup); r=nox

This is a rebase of #17325 with `[replace]` entries removed, a bunch more dependencies updated, and some more compile fixes. Original work by @Eijebong, thanks a lot! Source-Repo: https://github.com/servo/servo Source-Revision: 66c130d55aa0d7af1104c00e93a5bf950f23a383 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 323361580a540d8b296f6f7d77f20d46cbdc5c73
2017-06-16 05:03:18 -07:00 · 2017-06-16 05:03:18 -07:00 · 817c7746be
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
--- a/servo/components/atoms/Cargo.toml
+++ b/servo/components/atoms/Cargo.toml
@ -11,7 +11,7 @@ workspace = "../.."
 path = "lib.rs"

 [dependencies]
-string_cache = {version = "0.5", features = ["heapsize"]}
+string_cache = {version = "0.6", features = ["heapsize"]}

 [build-dependencies]
 string_cache_codegen = "0.4"
--- a/servo/components/bluetooth/Cargo.toml
+++ b/servo/components/bluetooth/Cargo.toml
@ -13,10 +13,10 @@ path = "lib.rs"
 bitflags = "0.7"
 bluetooth_traits = {path = "../bluetooth_traits"}
 device = {git = "https://github.com/servo/devices", features = ["bluetooth-test"]}
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 servo_config = {path = "../config"}
 servo_rand = {path = "../rand"}
-uuid = {version = "0.4", features = ["v4"]}
+uuid = {version = "0.5", features = ["v4"]}

 [target.'cfg(target_os = "linux")'.dependencies]
 tinyfiledialogs = "2.5.9"
--- a/servo/components/bluetooth_traits/Cargo.toml
+++ b/servo/components/bluetooth_traits/Cargo.toml
@ -10,8 +10,7 @@ name = "bluetooth_traits"
 path = "lib.rs"

 [dependencies]
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 regex = "0.2"
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
 servo_config = {path = "../config"}
--- a/servo/components/bluetooth_traits/lib.rs
+++ b/servo/components/bluetooth_traits/lib.rs
@ -4,8 +4,7 @@

 extern crate ipc_channel;
 extern crate regex;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate servo_config;

 pub mod blocklist;
--- a/servo/components/canvas/Cargo.toml
+++ b/servo/components/canvas/Cargo.toml
@ -12,12 +12,12 @@ path = "lib.rs"
 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure"}
 canvas_traits = {path = "../canvas_traits"}
-cssparser = "0.14.0"
-euclid = "0.14.4"
+cssparser = "0.15"
+euclid = "0.15"
 gleam = "0.4"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 log = "0.3.5"
 num-traits = "0.1.32"
-offscreen_gl_context = { version = "0.9", features = ["serde"] }
+offscreen_gl_context = { version = "0.11", features = ["serde"] }
 servo_config = {path = "../config"}
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
--- a/servo/components/canvas_traits/Cargo.toml
+++ b/servo/components/canvas_traits/Cargo.toml
@ -10,11 +10,10 @@ name = "canvas_traits"
 path = "lib.rs"

 [dependencies]
-cssparser = "0.14.0"
-euclid = "0.14.4"
+cssparser = "0.15"
+euclid = "0.15"
 heapsize = "0.4"
 heapsize_derive = "0.1"
-ipc-channel = "0.7"
-serde = "0.9"
-serde_derive = "0.9"
+ipc-channel = "0.8"
+serde = "1.0"
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
--- a/servo/components/canvas_traits/lib.rs
+++ b/servo/components/canvas_traits/lib.rs
@ -12,7 +12,7 @@ extern crate euclid;
 extern crate heapsize;
 #[macro_use] extern crate heapsize_derive;
 extern crate ipc_channel;
-#[macro_use] extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate webrender_traits;

 use cssparser::RGBA;
--- a/servo/components/compositing/Cargo.toml
+++ b/servo/components/compositing/Cargo.toml
@ -10,11 +10,11 @@ name = "compositing"
 path = "lib.rs"

 [dependencies]
-euclid = "0.14"
+euclid = "0.15"
 gfx_traits = {path = "../gfx_traits"}
 gleam = "0.4"
 image = "0.12"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 log = "0.3.5"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
--- a/servo/components/config/Cargo.toml
+++ b/servo/components/config/Cargo.toml
@ -10,14 +10,13 @@ name = "servo_config"
 path = "lib.rs"

 [dependencies]
-euclid = "0.14.4"
+euclid = "0.15"
 getopts = "0.2.11"
 lazy_static = "0.2"
 log = "0.3.5"
 num_cpus = "1.1.0"
 rustc-serialize = "0.3"
-serde = {version = "0.9"}
-serde_derive = {version = "0.9"}
+serde = "1.0"
 servo_geometry = {path = "../geometry"}
 servo_url = {path = "../url"}
 url = "1.2"
--- a/servo/components/config/lib.rs
+++ b/servo/components/config/lib.rs
@ -12,7 +12,7 @@ extern crate getopts;
 #[macro_use] extern crate log;
 extern crate num_cpus;
 extern crate rustc_serialize;
-#[macro_use] extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate servo_geometry;
 extern crate servo_url;
 extern crate url;
--- a/servo/components/constellation/Cargo.toml
+++ b/servo/components/constellation/Cargo.toml
@ -18,22 +18,21 @@ canvas_traits = {path = "../canvas_traits"}
 compositing = {path = "../compositing"}
 debugger = {path = "../debugger"}
 devtools_traits = {path = "../devtools_traits"}
-euclid = "0.14.4"
+euclid = "0.15"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 hyper = "0.10"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 itertools = "0.5"
 layout_traits = {path = "../layout_traits"}
 log = "0.3.5"
 msg = {path = "../msg"}
 net = {path = "../net"}
 net_traits = {path = "../net_traits"}
-offscreen_gl_context = { version = "0.9", features = ["serde"] }
+offscreen_gl_context = { version = "0.11", features = ["serde"] }
 profile_traits = {path = "../profile_traits"}
 script_traits = {path = "../script_traits"}
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
 style_traits = {path = "../style_traits"}
 servo_config = {path = "../config"}
 servo_rand = {path = "../rand"}
--- a/servo/components/constellation/constellation.rs
+++ b/servo/components/constellation/constellation.rs
@ -479,7 +479,7 @@ const WARNINGS_BUFFER_SIZE: usize = 32;
 /// but does not panic on deserializtion errors.
 fn route_ipc_receiver_to_new_mpsc_receiver_preserving_errors<T>(ipc_receiver: IpcReceiver<T>)
    -> Receiver<Result<T, IpcError>>
-    where T: Deserialize + Serialize + Send + 'static
+    where T: for<'de> Deserialize<'de> + Serialize + Send + 'static
 {
        let (mpsc_sender, mpsc_receiver) = channel();
        ROUTER.add_route(ipc_receiver.to_opaque(), Box::new(move |message| {
--- a/servo/components/constellation/lib.rs
+++ b/servo/components/constellation/lib.rs
@ -32,9 +32,7 @@ extern crate net_traits;
 extern crate offscreen_gl_context;
 extern crate profile_traits;
 extern crate script_traits;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate servo_config;
 extern crate servo_rand;
 extern crate servo_remutex;
--- a/servo/components/devtools/Cargo.toml
+++ b/servo/components/devtools/Cargo.toml
@ -12,11 +12,10 @@ path = "lib.rs"
 [dependencies]
 devtools_traits = {path = "../devtools_traits"}
 hyper = "0.10"
-hyper_serde = "0.6"
-ipc-channel = "0.7"
+hyper_serde = "0.7"
+ipc-channel = "0.8"
 log = "0.3.5"
 msg = {path = "../msg"}
-serde = "0.9"
-serde_derive = "0.9"
-serde_json = "0.9"
+serde = "1.0"
+serde_json = "1.0"
 time = "0.1"
--- a/servo/components/devtools/lib.rs
+++ b/servo/components/devtools/lib.rs
@ -20,9 +20,7 @@ extern crate ipc_channel;
 #[macro_use]
 extern crate log;
 extern crate msg;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate serde_json;
 extern crate time;

@ -514,8 +512,8 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
                    message: css_error.msg,
                    logLevel: LogLevel::Warn,
                    filename: css_error.filename,
-                    lineNumber: css_error.line,
-                    columnNumber: css_error.column,
+                    lineNumber: css_error.line as usize,
+                    columnNumber: css_error.column as usize,
                };
                handle_console_message(actors.clone(), id, None, console_message,
                                       &actor_pipelines, &actor_workers)
--- a/servo/components/devtools_traits/Cargo.toml
+++ b/servo/components/devtools_traits/Cargo.toml
@ -14,10 +14,9 @@ bitflags = "0.7"
 heapsize = "0.4"
 heapsize_derive = "0.1"
 hyper = "0.10"
-hyper_serde = "0.6"
-ipc-channel = "0.7"
+hyper_serde = "0.7"
+ipc-channel = "0.8"
 msg = {path = "../msg"}
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
 servo_url = {path = "../url"}
 time = "0.1"
--- a/servo/components/devtools_traits/lib.rs
+++ b/servo/components/devtools_traits/lib.rs
@ -19,7 +19,7 @@ extern crate heapsize;
 extern crate hyper;
 extern crate ipc_channel;
 extern crate msg;
-#[macro_use] extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate servo_url;
 extern crate time;

@ -43,8 +43,8 @@ pub struct DevtoolsPageInfo {
 #[derive(Debug, Deserialize, HeapSizeOf, Serialize, Clone)]
 pub struct CSSError {
    pub filename: String,
-    pub line: usize,
-    pub column: usize,
+    pub line: u32,
+    pub column: u32,
    pub msg: String
 }

--- a/servo/components/geometry/Cargo.toml
+++ b/servo/components/geometry/Cargo.toml
@ -14,6 +14,6 @@ path = "lib.rs"
 servo = ["euclid/unstable"]

 [dependencies]
-app_units = "0.4.1"
-euclid = "0.14"
+app_units = "0.5"
+euclid = "0.15"
 heapsize = "0.4"
--- a/servo/components/gfx/Cargo.toml
+++ b/servo/components/gfx/Cargo.toml
@ -11,16 +11,16 @@ name = "gfx"
 path = "lib.rs"

 [dependencies]
-app_units = "0.4.1"
+app_units = "0.5"
 bitflags = "0.7"
-euclid = "0.14.4"
+euclid = "0.15"
 fnv = "1.0"
 fontsan = {git = "https://github.com/servo/fontsan"}
 gfx_traits = {path = "../gfx_traits"}
 harfbuzz-sys = "0.1"
 heapsize = "0.4"
 heapsize_derive = "0.1"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 lazy_static = "0.2"
 libc = "0.2"
 log = "0.3.5"
@ -28,8 +28,7 @@ msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 ordered-float = "0.4"
 range = {path = "../range"}
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
 servo_atoms = {path = "../atoms"}
 servo_geometry = {path = "../geometry"}
 servo_url = {path = "../url"}
@ -45,8 +44,8 @@ xi-unicode = "0.1.0"
 [target.'cfg(target_os = "macos")'.dependencies]
 byteorder = "1.0"
 core-foundation = "0.3"
-core-graphics = "0.7"
-core-text = "4.0"
+core-graphics = "0.8"
+core-text = "5.0"

 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
 freetype = "0.2"
@ -55,11 +54,11 @@ freetype = "0.2"
 servo-fontconfig = "0.2.1"

 [target.'cfg(target_os = "android")'.dependencies]
-xml5ever = {version = "0.7", features = ["unstable"]}
+xml5ever = {version = "0.8", features = ["unstable"]}

 [target.'cfg(any(target_feature = "sse2", target_feature = "neon"))'.dependencies]
 simd = "0.2.0"

 [target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.3"
+dwrote = "0.4"
 truetype = "0.26"
--- a/servo/components/gfx/lib.rs
+++ b/servo/components/gfx/lib.rs
@ -56,10 +56,7 @@ extern crate msg;
 extern crate net_traits;
 extern crate ordered_float;
 extern crate range;
-#[cfg(target_os = "macos")]
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate servo_geometry;
 extern crate servo_url;
 #[macro_use] extern crate servo_atoms;
--- a/servo/components/gfx/platform/macos/font_template.rs
+++ b/servo/components/gfx/platform/macos/font_template.rs
@ -128,12 +128,12 @@ impl Serialize for CachedCTFont {
    }
 }

-impl Deserialize for CachedCTFont {
+impl<'de> Deserialize<'de> for CachedCTFont {
    fn deserialize<D>(deserializer: D) -> Result<CachedCTFont, D::Error>
-                      where D: Deserializer {
+                      where D: Deserializer<'de> {
        struct NoneOptionVisitor;

-        impl Visitor for NoneOptionVisitor {
+        impl<'de> Visitor<'de> for NoneOptionVisitor {
            type Value = CachedCTFont;

            fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
--- a/servo/components/gfx_traits/Cargo.toml
+++ b/servo/components/gfx_traits/Cargo.toml
@ -13,5 +13,4 @@ path = "lib.rs"
 heapsize = "0.4"
 heapsize_derive = "0.1"
 range = {path = "../range"}
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
--- a/servo/components/gfx_traits/lib.rs
+++ b/servo/components/gfx_traits/lib.rs
@ -9,10 +9,8 @@

 extern crate heapsize;
 #[macro_use] extern crate heapsize_derive;
-#[macro_use]
-extern crate range;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate range;
+#[macro_use] extern crate serde;

 pub mod print_tree;

--- a/servo/components/layout/Cargo.toml
+++ b/servo/components/layout/Cargo.toml
@ -10,17 +10,17 @@ name = "layout"
 path = "lib.rs"

 [dependencies]
-app_units = "0.4.1"
+app_units = "0.5"
 atomic_refcell = "0.1"
 bitflags = "0.7"
 canvas_traits = {path = "../canvas_traits"}
-euclid = "0.14.4"
+euclid = "0.15"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.4"
-html5ever = "0.17"
-ipc-channel = "0.7"
+html5ever = "0.18"
+ipc-channel = "0.8"
 libc = "0.2"
 log = "0.3.5"
 msg = {path = "../msg"}
@ -33,10 +33,9 @@ rayon = "0.8"
 script_layout_interface = {path = "../script_layout_interface"}
 script_traits = {path = "../script_traits"}
 selectors = { path = "../selectors" }
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
 servo_geometry = {path = "../geometry"}
-serde_json = "0.9"
+serde_json = "1.0"
 servo_config = {path = "../config"}
 servo_url = {path = "../url"}
 smallvec = "0.4"
--- a/servo/components/layout/lib.rs
+++ b/servo/components/layout/lib.rs
@ -36,9 +36,7 @@ extern crate range;
 extern crate rayon;
 extern crate script_layout_interface;
 extern crate script_traits;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate serde_json;
 extern crate servo_config;
 extern crate servo_geometry;
--- a/servo/components/layout_thread/Cargo.toml
+++ b/servo/components/layout_thread/Cargo.toml
@ -10,13 +10,13 @@ name = "layout_thread"
 path = "lib.rs"

 [dependencies]
-app_units = "0.4.1"
-euclid = "0.14.4"
+app_units = "0.5"
+euclid = "0.15"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.4"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 layout = {path = "../layout"}
 layout_traits = {path = "../layout_traits"}
 lazy_static = "0.2"
@ -30,8 +30,7 @@ script = {path = "../script"}
 script_layout_interface = {path = "../script_layout_interface"}
 script_traits = {path = "../script_traits"}
 selectors = { path = "../selectors" }
-serde_derive = "0.9"
-serde_json = "0.9"
+serde_json = "1.0"
 servo_config = {path = "../config"}
 servo_geometry = {path = "../geometry"}
 servo_url = {path = "../url"}
--- a/servo/components/layout_traits/Cargo.toml
+++ b/servo/components/layout_traits/Cargo.toml
@ -11,7 +11,7 @@ path = "lib.rs"

 [dependencies]
 gfx = {path = "../gfx"}
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 profile_traits = {path = "../profile_traits"}
--- a/servo/components/msg/Cargo.toml
+++ b/servo/components/msg/Cargo.toml
@ -13,6 +13,5 @@ path = "lib.rs"
 bitflags = "0.7"
 heapsize = "0.4"
 heapsize_derive = "0.1"
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
--- a/servo/components/msg/lib.rs
+++ b/servo/components/msg/lib.rs
@ -8,8 +8,7 @@
 extern crate bitflags;
 extern crate heapsize;
 #[macro_use] extern crate heapsize_derive;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate webrender_traits;

 pub mod constellation_msg;
--- a/servo/components/net/Cargo.toml
+++ b/servo/components/net/Cargo.toml
@ -16,10 +16,10 @@ cookie = "0.6"
 devtools_traits = {path = "../devtools_traits"}
 flate2 = "0.2.0"
 hyper = "0.10"
-hyper_serde = "0.6"
+hyper_serde = "0.7"
 hyper-openssl = "0.2.2"
 immeta = "0.3.1"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 lazy_static = "0.2"
 log = "0.3.5"
 matches = "0.1"
@ -30,9 +30,8 @@ net_traits = {path = "../net_traits"}
 openssl = "0.9"
 parse-hosts = "0.3.0"
 profile_traits = {path = "../profile_traits"}
-serde = "0.9"
-serde_derive = "0.9"
-serde_json = "0.9"
+serde = "1.0"
+serde_json = "1.0"
 servo_config = {path = "../config"}
 servo_url = {path = "../url"}
 servo-websocket = "0.19"
@ -40,7 +39,7 @@ threadpool = "1.0"
 time = "0.1.17"
 unicase = "1.4.0"
 url = {version = "1.2", features = ["heap_size"]}
-uuid = {version = "0.4", features = ["v4"]}
+uuid = {version = "0.5", features = ["v4"]}
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}

 [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
--- a/servo/components/net/lib.rs
+++ b/servo/components/net/lib.rs
@ -28,9 +28,7 @@ extern crate net_traits;
 extern crate openssl;
 extern crate parse_hosts;
 extern crate profile_traits;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate serde_json;
 extern crate servo_config;
 extern crate servo_url;
--- a/servo/components/net/resource_thread.rs
+++ b/servo/components/net/resource_thread.rs
@ -214,7 +214,7 @@ impl ResourceChannelManager {
 }

 pub fn read_json_from_file<T>(data: &mut T, config_dir: &Path, filename: &str)
-    where T: Deserialize
+    where T: for<'de> Deserialize<'de>
 {
    let path = config_dir.join(filename);
    let display = path.display();
--- a/servo/components/net_traits/Cargo.toml
+++ b/servo/components/net_traits/Cargo.toml
@ -14,18 +14,17 @@ cookie = "0.6"
 heapsize = "0.4"
 heapsize_derive = "0.1"
 hyper = "0.10"
-hyper_serde = "0.6"
+hyper_serde = "0.7"
 image = "0.12"
 immeta = "0.3.1"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 lazy_static = "0.2"
 log = "0.3.5"
 msg = {path = "../msg"}
 num-traits = "0.1.32"
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
 servo_config = {path = "../config"}
 servo_url = {path = "../url"}
 url = {version = "1.2", features = ["heap_size"]}
-uuid = {version = "0.4", features = ["v4", "serde"]}
+uuid = {version = "0.5", features = ["v4", "serde"]}
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
--- a/servo/components/net_traits/lib.rs
+++ b/servo/components/net_traits/lib.rs
@ -9,21 +9,16 @@

 extern crate cookie as cookie_rs;
 extern crate heapsize;
-#[macro_use]
-extern crate heapsize_derive;
+#[macro_use] extern crate heapsize_derive;
 extern crate hyper;
 extern crate hyper_serde;
 extern crate image as piston_image;
 extern crate ipc_channel;
-#[macro_use]
-extern crate lazy_static;
-#[macro_use]
-extern crate log;
+#[macro_use] extern crate lazy_static;
+#[macro_use] extern crate log;
 extern crate msg;
 extern crate num_traits;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate servo_config;
 extern crate servo_url;
 extern crate url;
@ -270,7 +265,7 @@ pub type IpcSendResult = Result<(), IpcError>;
 /// used by net_traits::ResourceThreads to ease the use its IpcSender sub-fields
 /// XXX: If this trait will be used more in future, some auto derive might be appealing
 pub trait IpcSend<T>
-    where T: serde::Serialize + serde::Deserialize,
+    where T: serde::Serialize + for<'de> serde::Deserialize<'de>,
 {
    /// send message T
    fn send(&self, T) -> IpcSendResult;
--- a/servo/components/profile/Cargo.toml
+++ b/servo/components/profile/Cargo.toml
@ -11,12 +11,11 @@ path = "lib.rs"

 [dependencies]
 profile_traits = {path = "../profile_traits"}
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 heartbeats-simple = "0.4"
 log = "0.3.5"
-serde = "0.9"
-serde_derive = "0.9"
-serde_json = "0.9"
+serde = "1.0"
+serde_json = "1.0"
 servo_config = {path = "../config"}
 time = "0.1.12"

--- a/servo/components/profile/lib.rs
+++ b/servo/components/profile/lib.rs
@ -21,7 +21,7 @@ extern crate profile_traits;
 #[cfg(target_os = "linux")]
 extern crate regex;
 #[macro_use]
-extern crate serde_derive;
+extern crate serde;
 extern crate serde_json;
 extern crate servo_config;
 #[cfg(target_os = "macos")]
--- a/servo/components/profile_traits/Cargo.toml
+++ b/servo/components/profile_traits/Cargo.toml
@ -15,10 +15,9 @@ energy-profiling = ["energymon", "energy-monitor"]
 [dependencies]
 energy-monitor = {version = "0.2.0", optional = true}
 energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true}
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 log = "0.3.5"
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
 servo_config = {path = "../config"}
 signpost = {git = "https://github.com/pcwalton/signpost.git"}
 time = "0.1.12"
--- a/servo/components/profile_traits/lib.rs
+++ b/servo/components/profile_traits/lib.rs
@ -12,8 +12,7 @@
 extern crate ipc_channel;
 #[macro_use]
 extern crate log;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate servo_config;
 extern crate signpost;

--- a/servo/components/range/Cargo.toml
+++ b/servo/components/range/Cargo.toml
@ -14,5 +14,4 @@ path = "lib.rs"
 heapsize = "0.4"
 heapsize_derive = "0.1"
 num-traits = "0.1.32"
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
--- a/servo/components/range/lib.rs
+++ b/servo/components/range/lib.rs
@ -9,8 +9,7 @@
 extern crate heapsize;
 #[macro_use] extern crate heapsize_derive;
 extern crate num_traits;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;

 use std::cmp::{self, max, min};
 use std::fmt;
--- a/servo/components/script/Cargo.toml
+++ b/servo/components/script/Cargo.toml
@ -18,14 +18,14 @@ debugmozjs = ['js/debugmozjs']
 cmake = "0.1"
 phf_codegen = "0.7.18"
 phf_shared = "0.7.18"
-serde_json = "0.9"
+serde_json = "1.0"

 [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
 tinyfiledialogs = "2.5.9"

 [dependencies]
 angle = {git = "https://github.com/servo/angle", branch = "servo"}
-app_units = "0.4.1"
+app_units = "0.5"
 audio-video-metadata = "0.1.2"
 atomic_refcell = "0.1"
 base64 = "0.5.2"
@ -35,24 +35,24 @@ byteorder = "1.0"
 canvas_traits = {path = "../canvas_traits"}
 caseless = "0.1.0"
 cookie = "0.6"
-cssparser = "0.14.0"
+cssparser = "0.15"
 deny_public_fields = {path = "../deny_public_fields"}
 devtools_traits = {path = "../devtools_traits"}
 dom_struct = {path = "../dom_struct"}
 domobject_derive = {path = "../domobject_derive"}
 encoding = "0.2"
-euclid = "0.14.4"
+euclid = "0.15"
 fnv = "1.0"
 gleam = "0.4"
 gfx_traits = {path = "../gfx_traits"}
 half = "1.0"
 heapsize = "0.4"
 heapsize_derive = "0.1"
-html5ever = {version = "0.17", features = ["heap_size", "unstable"]}
+html5ever = {version = "0.18", features = ["heap_size", "unstable"]}
 hyper = "0.10"
-hyper_serde = "0.6"
+hyper_serde = "0.7"
 image = "0.12"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 js = {git = "https://github.com/servo/rust-mozjs", features = ["promises"]}
 jstraceable_derive = {path = "../jstraceable_derive"}
 lazy_static = "0.2"
@ -63,7 +63,7 @@ mime_guess = "1.8.0"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 num-traits = "0.1.32"
-offscreen_gl_context = { version = "0.9", features = ["serde"] }
+offscreen_gl_context = { version = "0.11", features = ["serde"] }
 open = "1.1.1"
 parking_lot = "0.3"
 phf = "0.7.18"
@ -76,7 +76,7 @@ script_layout_interface = {path = "../script_layout_interface"}
 script_plugins = {path = "../script_plugins"}
 script_traits = {path = "../script_traits"}
 selectors = { path = "../selectors" }
-serde = "0.9"
+serde = "1.0"
 servo_atoms = {path = "../atoms"}
 servo_config = {path = "../config"}
 servo_geometry = {path = "../geometry" }
@ -90,8 +90,8 @@ time = "0.1.12"
 unicode-segmentation = "1.1.0"
 url = {version = "1.2", features = ["heap_size", "query_encoding"]}
 utf-8 = "0.7"
-uuid = {version = "0.4", features = ["v4"]}
-xml5ever = {version = "0.7", features = ["unstable"]}
+uuid = {version = "0.5", features = ["v4"]}
+xml5ever = {version = "0.8", features = ["unstable"]}
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 webvr = {path = "../webvr"}
 webvr_traits = {path = "../webvr_traits"}
--- a/servo/components/script/dom/bindings/trace.rs
+++ b/servo/components/script/dom/bindings/trace.rs
@ -405,7 +405,7 @@ unsafe impl<A, B> JSTraceable for fn(A) -> B {
    }
 }

-unsafe impl<T> JSTraceable for IpcSender<T> where T: Deserialize + Serialize {
+unsafe impl<T> JSTraceable for IpcSender<T> where T: for<'de> Deserialize<'de> + Serialize {
    #[inline]
    unsafe fn trace(&self, _: *mut JSTracer) {
        // Do nothing
@ -427,7 +427,7 @@ unsafe impl JSTraceable for () {
    }
 }

-unsafe impl<T> JSTraceable for IpcReceiver<T> where T: Deserialize + Serialize {
+unsafe impl<T> JSTraceable for IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serialize {
    #[inline]
    unsafe fn trace(&self, _: *mut JSTracer) {
        // Do nothing
--- a/servo/components/script/script_thread.rs
+++ b/servo/components/script/script_thread.rs
@ -2322,7 +2322,7 @@ impl ScriptThread {
    }

    fn handle_css_error_reporting(&self, pipeline_id: PipelineId, filename: String,
-                                  line: usize, column: usize, msg: String) {
+                                  line: u32, column: u32, msg: String) {
        let sender = match self.devtools_chan {
            Some(ref sender) => sender,
            None => return,
--- a/servo/components/script_layout_interface/Cargo.toml
+++ b/servo/components/script_layout_interface/Cargo.toml
@ -10,16 +10,16 @@ name = "script_layout_interface"
 path = "lib.rs"

 [dependencies]
-app_units = "0.4.1"
+app_units = "0.5"
 atomic_refcell = "0.1"
 canvas_traits = {path = "../canvas_traits"}
-cssparser = "0.14.0"
-euclid = "0.14.4"
+cssparser = "0.15"
+euclid = "0.15"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.4"
 heapsize_derive = "0.1"
-html5ever = "0.17"
-ipc-channel = "0.7"
+html5ever = "0.18"
+ipc-channel = "0.8"
 libc = "0.2"
 log = "0.3.5"
 msg = {path = "../msg"}
--- a/servo/components/script_layout_interface/reporter.rs
+++ b/servo/components/script_layout_interface/reporter.rs
@ -29,7 +29,7 @@ impl ParseErrorReporter for CSSErrorReporter {
                        url: &ServoUrl,
                        line_number_offset: u64) {
        let location = input.source_location(position);
-        let line_offset = location.line + line_number_offset as usize;
+        let line_offset = location.line + line_number_offset as u32;
        if log_enabled!(log::LogLevel::Info) {
            info!("Url:\t{}\n{}:{} {}",
                  url.as_str(),
--- a/servo/components/script_traits/Cargo.toml
+++ b/servo/components/script_traits/Cargo.toml
@ -10,26 +10,25 @@ name = "script_traits"
 path = "lib.rs"

 [dependencies]
-app_units = "0.4"
+app_units = "0.5"
 bluetooth_traits = {path = "../bluetooth_traits"}
 canvas_traits = {path = "../canvas_traits"}
 cookie = "0.6"
 devtools_traits = {path = "../devtools_traits"}
-euclid = "0.14.4"
+euclid = "0.15"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.4"
 heapsize_derive = "0.1"
 hyper = "0.10"
-hyper_serde = "0.6"
-ipc-channel = "0.7"
+hyper_serde = "0.7"
+ipc-channel = "0.8"
 libc = "0.2"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
-offscreen_gl_context = { version = "0.9", features = ["serde"] }
+offscreen_gl_context = { version = "0.11", features = ["serde"] }
 profile_traits = {path = "../profile_traits"}
 rustc-serialize = "0.3.4"
-serde = "0.9"
-serde_derive = "0.9"
+serde = "1.0"
 servo_atoms = {path = "../atoms"}
 servo_url = {path = "../url"}
 style_traits = {path = "../style_traits", features = ["servo"]}
--- a/servo/components/script_traits/lib.rs
+++ b/servo/components/script_traits/lib.rs
@ -28,9 +28,7 @@ extern crate net_traits;
 extern crate offscreen_gl_context;
 extern crate profile_traits;
 extern crate rustc_serialize;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate servo_atoms;
 extern crate servo_url;
 extern crate style_traits;
@ -96,8 +94,8 @@ impl Serialize for UntrustedNodeAddress {
    }
 }

-impl Deserialize for UntrustedNodeAddress {
-    fn deserialize<D: Deserializer>(d: D) -> Result<UntrustedNodeAddress, D::Error> {
+impl<'de> Deserialize<'de> for UntrustedNodeAddress {
+    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<UntrustedNodeAddress, D::Error> {
        let value: usize = try!(Deserialize::deserialize(d));
        Ok(UntrustedNodeAddress::from_id(value))
    }
@ -295,7 +293,7 @@ pub enum ConstellationControlMsg {
    /// The strings are key, old value and new value.
    DispatchStorageEvent(PipelineId, StorageType, ServoUrl, Option<String>, Option<String>, Option<String>),
    /// Report an error from a CSS parser for the given pipeline
-    ReportCSSError(PipelineId, String, usize, usize, String),
+    ReportCSSError(PipelineId, String, u32, u32, String),
    /// Reload the given page.
    Reload(PipelineId),
    /// Notifies the script thread of WebVR events.
--- a/servo/components/selectors/Cargo.toml
+++ b/servo/components/selectors/Cargo.toml
@ -24,7 +24,7 @@ gecko_like_types = []
 [dependencies]
 bitflags = "0.7"
 matches = "0.1"
-cssparser = "0.14.0"
+cssparser = "0.15"
 log = "0.3"
 fnv = "1.0"
 phf = "0.7.18"
--- a/servo/components/servo/Cargo.toml
+++ b/servo/components/servo/Cargo.toml
@ -30,10 +30,10 @@ debugger = {path = "../debugger"}
 devtools = {path = "../devtools"}
 devtools_traits = {path = "../devtools_traits"}
 env_logger = "0.4"
-euclid = "0.14.4"
+euclid = "0.15"
 gfx = {path = "../gfx"}
 gleam = "0.4"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 layout_thread = {path = "../layout_thread"}
 log = "0.3"
 msg = {path = "../msg"}
--- a/servo/components/servo_arc/Cargo.toml
+++ b/servo/components/servo_arc/Cargo.toml
@ -14,5 +14,5 @@ servo = ["serde", "heapsize"]

 [dependencies]
 heapsize = {version = "0.4.0", optional = true}
-serde = {version = "0.9", optional = true}
+serde = {version = "1.0", optional = true}
 nodrop = {version = "0.1.8"}
--- a/servo/components/servo_arc/lib.rs
+++ b/servo/components/servo_arc/lib.rs
@ -447,11 +447,11 @@ impl<T: HeapSizeOf> HeapSizeOf for Arc<T> {
 }

 #[cfg(feature = "servo")]
-impl<T: Deserialize> Deserialize for Arc<T>
+impl<'de, T: Deserialize<'de>> Deserialize<'de> for Arc<T>
 {
    fn deserialize<D>(deserializer: D) -> Result<Arc<T>, D::Error>
    where
-        D: ::serde::de::Deserializer,
+        D: ::serde::de::Deserializer<'de>,
    {
        T::deserialize(deserializer).map(Arc::new)
    }
--- a/servo/components/style/Cargo.toml
+++ b/servo/components/style/Cargo.toml
@ -18,7 +18,7 @@ doctest = false
 [features]
 gecko = ["nsstring_vendor", "num_cpus", "style_traits/gecko"]
 use_bindgen = ["bindgen", "regex", "toml"]
-servo = ["serde", "serde_derive", "heapsize", "heapsize_derive",
+servo = ["serde", "heapsize", "heapsize_derive",
         "style_traits/servo", "servo_atoms", "servo_config", "html5ever",
         "cssparser/heapsize", "cssparser/serde", "encoding", "smallvec/heapsizeof",

@ -30,7 +30,7 @@ testing = []
 gecko_debug = ["nsstring_vendor/gecko_debug"]

 [dependencies]
-app_units = "0.4.1"
+app_units = "0.5"
 arrayvec = "0.3.20"
 arraydeque = "0.2.3"
 atomic_refcell = "0.1"
@ -38,14 +38,14 @@ bitflags = "0.7"
 bit-vec = "0.4.3"
 byteorder = "1.0"
 cfg-if = "0.1.0"
-cssparser = "0.14.0"
+cssparser = "0.15"
 encoding = {version = "0.2", optional = true}
-euclid = "0.14.4"
+euclid = "0.15"
 fnv = "1.0"
 heapsize = {version = "0.4", optional = true}
 heapsize_derive = {version = "0.1", optional = true}
 itoa = "0.3"
-html5ever = {version = "0.17", optional = true}
+html5ever = {version = "0.18", optional = true}
 lazy_static = "0.2"
 log = "0.3"
 matches = "0.1"
@ -59,9 +59,8 @@ pdqsort = "0.1.0"
 precomputed-hash = "0.1"
 rayon = "0.8"
 selectors = { path = "../selectors" }
-serde = {version = "0.9", optional = true}
-serde_derive = {version = "0.9", optional = true}
 servo_arc = { path = "../servo_arc" }
+serde = {version = "1.0", optional = true, features = ["derive"]}
 servo_atoms = {path = "../atoms", optional = true}
 servo_config = {path = "../config", optional = true}
 smallvec = "0.4"
--- a/servo/components/style/error_reporting.rs
+++ b/servo/components/style/error_reporting.rs
@ -169,7 +169,7 @@ impl ParseErrorReporter for RustLogReporter {
                        line_number_offset: u64) {
        if log_enabled!(log::LogLevel::Info) {
            let location = input.source_location(position);
-            let line_offset = location.line + line_number_offset as usize;
+            let line_offset = location.line + line_number_offset as u32;
            info!("Url:\t{}\n{}:{} {}", url.as_str(), line_offset, location.column, error.to_string())
        }
    }
--- a/servo/components/style/lib.rs
+++ b/servo/components/style/lib.rs
@ -72,7 +72,7 @@ extern crate pdqsort;
 #[cfg(feature = "gecko")] extern crate precomputed_hash;
 extern crate rayon;
 extern crate selectors;
-#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
+#[cfg(feature = "servo")] #[macro_use] extern crate serde;
 pub extern crate servo_arc;
 #[cfg(feature = "servo")] #[macro_use] extern crate servo_atoms;
 #[cfg(feature = "servo")] extern crate servo_config;
--- a/servo/components/style/stylesheets/rule_parser.rs
+++ b/servo/components/style/stylesheets/rule_parser.rs
@ -528,7 +528,7 @@ fn get_location_with_offset(
    offset: u64
 ) -> SourceLocation {
    SourceLocation {
-        line: location.line + offset as usize - 1,
+        line: location.line + offset as u32 - 1,
        column: location.column,
    }
 }
--- a/servo/components/style_traits/Cargo.toml
+++ b/servo/components/style_traits/Cargo.toml
@ -10,17 +10,15 @@ name = "style_traits"
 path = "lib.rs"

 [features]
-servo = ["heapsize", "heapsize_derive", "serde", "serde_derive",
-         "cssparser/heapsize", "cssparser/serde"]
+servo = ["heapsize", "heapsize_derive", "serde", "cssparser/heapsize", "cssparser/serde"]
 gecko = []

 [dependencies]
-app_units = "0.4.1"
+app_units = "0.5"
 bitflags = "0.7"
-cssparser = "0.14.0"
-euclid = "0.14.4"
+cssparser = "0.15"
+euclid = "0.15"
 heapsize = {version = "0.4", optional = true}
 heapsize_derive = {version = "0.1", optional = true}
 selectors = { path = "../selectors" }
-serde = {version = "0.9", optional = true}
-serde_derive = {version = "0.9", optional = true}
+serde = {version = "1.0", optional = true}
--- a/servo/components/style_traits/lib.rs
+++ b/servo/components/style_traits/lib.rs
@ -20,7 +20,7 @@ extern crate euclid;
 #[cfg(feature = "servo")] extern crate heapsize;
 #[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive;
 extern crate selectors;
-#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
+#[cfg(feature = "servo")] #[macro_use] extern crate serde;

 use selectors::parser::SelectorParseError;
 use std::borrow::Cow;
--- a/servo/components/url/Cargo.toml
+++ b/servo/components/url/Cargo.toml
@ -12,9 +12,8 @@ path = "lib.rs"
 [dependencies]
 heapsize = {version = "0.4"}
 heapsize_derive = {version = "0.1"}
-serde = {version = "0.9"}
-serde_derive = {version = "0.9"}
+serde = {version = "1.0"}
 servo_rand = {path = "../rand"}
 url = {version = "1.2", features = ["heap_size"]}
-url_serde = {version = "0.1.3"}
-uuid = {version = "0.4.0", features = ["v4", "serde"]}
+url_serde = {version = "0.2"}
+uuid = {version = "0.5.0", features = ["v4", "serde"]}
--- a/servo/components/url/lib.rs
+++ b/servo/components/url/lib.rs
@ -9,8 +9,7 @@

 #[macro_use] extern crate heapsize;
 #[macro_use] extern crate heapsize_derive;
-extern crate serde;
-#[macro_use] extern crate serde_derive;
+#[macro_use] extern crate serde;
 extern crate servo_rand;
 extern crate url;
 extern crate url_serde;
@ -209,9 +208,9 @@ impl serde::Serialize for ServoUrl {
    }
 }

-impl serde::Deserialize for ServoUrl {
+impl<'de> serde::Deserialize<'de> for ServoUrl {
    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where D: serde::Deserializer,
+        where D: serde::Deserializer<'de>,
    {
        url_serde::deserialize(deserializer).map(Self::from_url)
    }
--- a/servo/components/webdriver_server/Cargo.toml
+++ b/servo/components/webdriver_server/Cargo.toml
@ -12,10 +12,10 @@ path = "lib.rs"
 [dependencies]
 base64 = "0.5.2"
 cookie = "0.6"
-euclid = "0.14"
+euclid = "0.15"
 hyper = "0.10"
 image = "0.12"
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 log = "0.3.5"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
@ -25,5 +25,5 @@ script_traits = {path = "../script_traits"}
 servo_config = {path = "../config"}
 servo_url = {path = "../url"}
 url = {version = "1.2", features = ["heap_size"]}
-uuid = {version = "0.4", features = ["v4"]}
+uuid = {version = "0.5", features = ["v4"]}
 webdriver = "0.22"
--- a/servo/components/webvr/Cargo.toml
+++ b/servo/components/webvr/Cargo.toml
@ -10,7 +10,7 @@ name = "webvr"
 path = "lib.rs"

 [dependencies]
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 log = "0.3"
 msg = {path = "../msg"}
 script_traits = {path = "../script_traits"}
--- a/servo/components/webvr_traits/Cargo.toml
+++ b/servo/components/webvr_traits/Cargo.toml
@ -10,8 +10,7 @@ name = "webvr_traits"
 path = "lib.rs"

 [dependencies]
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 msg = {path = "../msg"}
-rust-webvr = {version = "0.4", features = ["serde-serialization"]}
-serde = "0.9"
-serde_derive = "0.9"
+rust-webvr = {version = "0.5", features = ["serde-serialization"]}
+serde = "1.0"
--- a/servo/components/webvr_traits/lib.rs
+++ b/servo/components/webvr_traits/lib.rs
@ -6,8 +6,7 @@

 extern crate ipc_channel;
 extern crate msg;
-#[macro_use]
-extern crate serde_derive;
+#[macro_use] extern crate serde;
 pub extern crate rust_webvr as webvr;

 mod webvr_traits;
--- a/servo/ports/cef/Cargo.toml
+++ b/servo/ports/cef/Cargo.toml
@ -20,7 +20,7 @@ debugmozjs = ["libservo/debugmozjs"]
 [dependencies]
 compositing = {path = "../../components/compositing"}
 devtools = {path = "../../components/devtools"}
-euclid = "0.14.4"
+euclid = "0.15"
 gleam = "0.4"
 glutin_app = {path = "../glutin"}
 libc = "0.2"
@ -37,7 +37,7 @@ webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc

 [target.'cfg(target_os="macos")'.dependencies]
 objc = "0.2"
-cocoa = "0.8"
+cocoa = "0.9"

 [target.'cfg(target_os="linux")'.dependencies]
 x11 = "2.3"
--- a/servo/ports/geckolib/Cargo.toml
+++ b/servo/ports/geckolib/Cargo.toml
@ -16,7 +16,7 @@ gecko_debug = ["style/gecko_debug"]

 [dependencies]
 atomic_refcell = "0.1"
-cssparser = "0.14.0"
+cssparser = "0.15"
 env_logger = {version = "0.4", default-features = false} # disable `regex` to reduce code size
 libc = "0.2"
 log = {version = "0.3.5", features = ["release_max_level_info"]}
--- a/servo/ports/glutin/Cargo.toml
+++ b/servo/ports/glutin/Cargo.toml
@ -11,13 +11,13 @@ path = "lib.rs"
 [dependencies]
 bitflags = "0.7"
 compositing = {path = "../../components/compositing"}
-euclid = "0.14.4"
+euclid = "0.15"
 gleam = "0.4"
 log = "0.3.5"
 msg = {path = "../../components/msg"}
 net_traits = {path = "../../components/net_traits"}
 script_traits = {path = "../../components/script_traits"}
-servo-glutin = "0.10"
+servo-glutin = "0.11"
 servo_geometry = {path = "../../components/geometry"}
 servo_config = {path = "../../components/config"}
 servo_url = {path = "../../components/url"}
--- a/servo/tests/unit/gfx/Cargo.toml
+++ b/servo/tests/unit/gfx/Cargo.toml
@ -10,7 +10,7 @@ path = "lib.rs"
 doctest = false

 [dependencies]
-cssparser = "0.14.0"
+cssparser = "0.15"
 gfx = {path = "../../../components/gfx"}
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 style = {path = "../../../components/style"}
--- a/servo/tests/unit/net/Cargo.toml
+++ b/servo/tests/unit/net/Cargo.toml
@ -15,8 +15,8 @@ devtools_traits = {path = "../../../components/devtools_traits"}
 flate2 = "0.2.0"
 hyper = "0.10"
 hyper-openssl = "0.2"
-hyper_serde = "0.6"
-ipc-channel = "0.7"
+hyper_serde = "0.7"
+ipc-channel = "0.8"
 msg = {path = "../../../components/msg"}
 net = {path = "../../../components/net"}
 net_traits = {path = "../../../components/net_traits"}
--- a/servo/tests/unit/profile/Cargo.toml
+++ b/servo/tests/unit/profile/Cargo.toml
@ -10,6 +10,6 @@ path = "lib.rs"
 doctest = false

 [dependencies]
-ipc-channel = "0.7"
+ipc-channel = "0.8"
 profile = {path = "../../../components/profile"}
 profile_traits = {path = "../../../components/profile_traits"}
--- a/servo/tests/unit/script/Cargo.toml
+++ b/servo/tests/unit/script/Cargo.toml
@ -10,7 +10,7 @@ path = "lib.rs"
 doctest = false

 [dependencies]
-euclid = "0.14.4"
+euclid = "0.15"
 msg = {path = "../../../components/msg"}
 script = {path = "../../../components/script"}
 servo_url = {path = "../../../components/url"}
--- a/servo/tests/unit/style/Cargo.toml
+++ b/servo/tests/unit/style/Cargo.toml
@ -14,10 +14,10 @@ testing = ["style/testing"]

 [dependencies]
 byteorder = "1.0"
-app_units = "0.4.1"
-cssparser = "0.14.0"
-euclid = "0.14.4"
-html5ever = "0.17"
+app_units = "0.5"
+cssparser = "0.15"
+euclid = "0.15"
+html5ever = "0.18"
 parking_lot = "0.3"
 rayon = "0.8"
 rustc-serialize = "0.3"
--- a/servo/tests/unit/style/rule_tree/bench.rs
+++ b/servo/tests/unit/style/rule_tree/bench.rs
@ -24,7 +24,7 @@ impl ParseErrorReporter for ErrorringErrorReporter {
                        url: &ServoUrl,
                        line_number_offset: u64) {
        let location = input.source_location(position);
-        let line_offset = location.line + line_number_offset as usize;
+        let line_offset = location.line + line_number_offset as u32;
        panic!("CSS error: {}\t\n{}:{} {}", url.as_str(), line_offset, location.column, error.to_string());
    }
 }
--- a/servo/tests/unit/style/stylesheets.rs
+++ b/servo/tests/unit/style/stylesheets.rs
@ -249,8 +249,8 @@ fn test_parse_stylesheet() {

 struct CSSError {
    pub url : ServoUrl,
-    pub line: usize,
-    pub column: usize,
+    pub line: u32,
+    pub column: u32,
    pub message: String
 }

@ -275,7 +275,7 @@ impl ParseErrorReporter for CSSInvalidErrorReporterTest {
                        line_number_offset: u64) {

        let location = input.source_location(position);
-        let line_offset = location.line + line_number_offset as usize;
+        let line_offset = location.line + line_number_offset as u32;

        let mut errors = self.errors.lock().unwrap();
        errors.push(
--- a/servo/tests/unit/stylo/Cargo.toml
+++ b/servo/tests/unit/stylo/Cargo.toml
@ -16,9 +16,9 @@ testing = ["style/testing"]

 [dependencies]
 atomic_refcell = "0.1"
-cssparser = "0.14.0"
+cssparser = "0.15"
 env_logger = "0.4"
-euclid = "0.14.4"
+euclid = "0.15"
 geckoservo = {path = "../../../ports/geckolib"}
 libc = "0.2"
 log = {version = "0.3.5", features = ["release_max_level_info"]}