servo: Merge #7509 - Upgrade to rustc 1.4.0-dev (cb9323ec0 2015-09-01) (from servo:rustup_2015-09-01); r=Manishearth

Source-Repo: https://github.com/servo/servo Source-Revision: f49615ca7b5d98ee603cf42f705073fbe4d414fb
2015-09-02 01:31:23 -06:00 · 2015-09-02 01:31:23 -06:00 · ea7357b400
--- a/servo/components/gfx/font.rs
+++ b/servo/components/gfx/font.rs
@ -28,7 +28,7 @@ use util::geometry::Au;
 // needed by the text shaper as well as access to the underlying font
 // resources needed by the graphics layer to draw glyphs.

-pub trait FontHandleMethods {
+pub trait FontHandleMethods: Sized {
    fn new_from_template(fctx: &FontContextHandle, template: Arc<FontTemplateData>, pt_size: Option<Au>)
                    -> Result<Self,()>;
    fn template(&self) -> Arc<FontTemplateData>;
--- a/servo/components/gfx/font_template.rs
+++ b/servo/components/gfx/font_template.rs
@ -70,7 +70,7 @@ impl FontTemplate {
        };

        let maybe_weak_ref = match maybe_strong_ref {
-            Some(ref strong_ref) => Some(strong_ref.downgrade()),
+            Some(ref strong_ref) => Some(Arc::downgrade(strong_ref)),
            None => None,
        };

@ -159,7 +159,7 @@ impl FontTemplate {

        assert!(self.strong_ref.is_none());
        let template_data = Arc::new(FontTemplateData::new(self.identifier.clone(), None));
-        self.weak_ref = Some(template_data.downgrade());
+        self.weak_ref = Some(Arc::downgrade(&template_data));
        template_data
    }
 }
--- a/servo/components/layout/animation.rs
+++ b/servo/components/layout/animation.rs
@ -108,7 +108,7 @@ pub fn recalc_style_for_animations(flow: &mut Flow,
                }

                let mut new_style = fragment.style.clone();
-                animation.property_animation.update(&mut *Arc::make_unique(&mut new_style),
+                animation.property_animation.update(&mut *Arc::make_mut(&mut new_style),
                                                    progress);
                damage.insert(incremental::compute_damage(&Some(fragment.style.clone()),
                                                          &new_style));
--- a/servo/components/layout/css/matching.rs
+++ b/servo/components/layout/css/matching.rs
@ -448,7 +448,7 @@ impl<'ln> PrivateMatchMethods for LayoutNode<'ln> {
                let this_opaque = self.opaque();
                if let Some(ref animations) = layout_context.running_animations.get(&this_opaque) {
                    for animation in *animations {
-                        animation.property_animation.update(&mut *Arc::make_unique(style), 1.0);
+                        animation.property_animation.update(&mut *Arc::make_mut(style), 1.0);
                    }
                }
            }
--- a/servo/components/layout/flow.rs
+++ b/servo/components/layout/flow.rs
@ -1493,7 +1493,7 @@ impl ContainingBlockLink {
    }

    fn set(&mut self, link: FlowRef) {
-        self.link = Some(link.downgrade())
+        self.link = Some(Arc::downgrade(&link))
    }

    #[allow(unsafe_code)]
--- a/servo/components/layout/fragment.rs
+++ b/servo/components/layout/fragment.rs
@ -724,7 +724,7 @@ impl UnscannedTextFragmentInfo {
    #[inline]
    pub fn from_text(text: String) -> UnscannedTextFragmentInfo {
        UnscannedTextFragmentInfo {
-            text: text.into_boxed_slice(),
+            text: text.into_boxed_str(),
        }
    }
 }
@ -2160,7 +2160,7 @@ impl Fragment {
                    break
                }
                if modified {
-                    unscanned_text_fragment_info.text = new_text_string.into_boxed_slice();
+                    unscanned_text_fragment_info.text = new_text_string.into_boxed_str();
                }

                WhitespaceStrippingResult::from_unscanned_text_fragment_info(
@ -2238,7 +2238,7 @@ impl Fragment {
                    for character in trailing_bidi_control_characters_to_retain.iter().rev() {
                        text.push(*character);
                    }
-                    unscanned_text_fragment_info.text = text.into_boxed_slice();
+                    unscanned_text_fragment_info.text = text.into_boxed_str();
                }

                WhitespaceStrippingResult::from_unscanned_text_fragment_info(
--- a/servo/components/layout/inline.rs
+++ b/servo/components/layout/inline.rs
@ -1119,9 +1119,9 @@ impl InlineFlow {
            // FIXME(pcwalton): This is an awful lot of uniqueness making. I don't see any easy way
            // to get rid of it without regressing the performance of the non-justified case,
            // though.
-            let run = Arc::make_unique(&mut scanned_text_fragment_info.run);
+            let run = Arc::make_mut(&mut scanned_text_fragment_info.run);
            {
-                let glyph_runs = Arc::make_unique(&mut run.glyphs);
+                let glyph_runs = Arc::make_mut(&mut run.glyphs);
                for mut glyph_run in &mut *glyph_runs {
                    let mut range = glyph_run.range.intersect(&fragment_range);
                    if range.is_empty() {
@ -1129,7 +1129,7 @@ impl InlineFlow {
                    }
                    range.shift_by(-glyph_run.range.begin());

-                    let glyph_store = Arc::make_unique(&mut glyph_run.glyph_store);
+                    let glyph_store = Arc::make_mut(&mut glyph_run.glyph_store);
                    glyph_store.distribute_extra_space_in_range(&range,
                                                                space_per_expansion_opportunity);
                }
--- a/servo/components/layout/text.rs
+++ b/servo/components/layout/text.rs
@ -400,7 +400,7 @@ fn split_first_fragment_at_newline_if_necessary(fragments: &mut LinkedList<Fragm
            string_before =
                unscanned_text_fragment_info.text[..(position + 1)].to_owned();
            unscanned_text_fragment_info.text =
-                unscanned_text_fragment_info.text[(position + 1)..].to_owned().into_boxed_slice();
+                unscanned_text_fragment_info.text[(position + 1)..].to_owned().into_boxed_str();
        }
        first_fragment.transform(first_fragment.border_box.size,
                                 SpecificFragmentInfo::UnscannedText(
--- a/servo/components/plugins/heap_size.rs
+++ b/servo/components/plugins/heap_size.rs
@ -24,6 +24,7 @@ use syntax::ptr::P;
 pub fn expand_heap_size(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem,
                        item: &Annotatable, push: &mut FnMut(Annotatable)) {
    let trait_def = TraitDef {
+        is_unsafe: false,
        span: span,
        attributes: Vec::new(),
        path: ty::Path::new(vec!("util", "mem", "HeapSizeOf")),
--- a/servo/components/plugins/jstraceable.rs
+++ b/servo/components/plugins/jstraceable.rs
@ -38,6 +38,7 @@ pub fn expand_dom_struct(cx: &mut ExtCtxt, sp: Span, _: &MetaItem, anno: Annotat
 pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item: &Annotatable,
                          push: &mut FnMut(Annotatable)) {
    let trait_def = TraitDef {
+        is_unsafe: false,
        span: span,
        attributes: Vec::new(),
        path: ty::Path::new(vec!("dom","bindings","trace","JSTraceable")),
--- a/servo/components/plugins/lints/inheritance_integrity.rs
+++ b/servo/components/plugins/lints/inheritance_integrity.rs
@ -4,7 +4,8 @@

 use rustc::lint::{Context, LintPass, LintArray, Level};
 use rustc::middle::def;
-use syntax::{ast, ast_util};
+use rustc::middle::def_id::DefId;
+use syntax::ast;

 use utils::match_lang_ty;

@ -26,7 +27,7 @@ impl LintPass for InheritancePass {
                        _gen: &ast::Generics, id: ast::NodeId) {
        // Lints are run post expansion, so it's fine to use
        // #[_dom_struct_marker] here without also checking for #[dom_struct]
-        if cx.tcx.has_attr(ast_util::local_def(id), "_dom_struct_marker") {
+        if cx.tcx.has_attr(DefId::local(id), "_dom_struct_marker") {
            // Find the reflector, if any
            let reflector_span = def.fields.iter().enumerate()
                                    .find(|&(ctr, f)| {
--- a/servo/components/plugins/lints/privatize.rs
+++ b/servo/components/plugins/lints/privatize.rs
@ -3,9 +3,10 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 use rustc::lint::{Context, LintPass, LintArray};
+use rustc::middle::def_id::DefId;
+use syntax::ast;
 use syntax::ast::Public;
 use syntax::attr::AttrMetaMethods;
-use syntax::{ast, ast_util};

 declare_lint!(PRIVATIZE, Deny,
              "Allows to enforce private fields for struct definitions");
@ -27,7 +28,7 @@ impl LintPass for PrivatizePass {
                        _i: ast::Ident,
                        _gen: &ast::Generics,
                        id: ast::NodeId) {
-        if cx.tcx.has_attr(ast_util::local_def(id), "privatize") {
+        if cx.tcx.has_attr(DefId::local(id), "privatize") {
            for field in &def.fields {
                match field.node {
                    ast::StructField_ { kind: ast::NamedField(ident, visibility), .. } if visibility == Public => {
--- a/servo/components/plugins/lints/unrooted_must_root.rs
+++ b/servo/components/plugins/lints/unrooted_must_root.rs
@ -120,14 +120,14 @@ impl LintPass for UnrootedPass {
    fn check_fn(&mut self, cx: &Context, kind: visit::FnKind, decl: &ast::FnDecl,
                block: &ast::Block, _span: codemap::Span, id: ast::NodeId) {
        match kind {
-            visit::FkItemFn(i, _, _, _, _, _) |
-            visit::FkMethod(i, _, _) if i.name.as_str() == "new"
-                                        || i.name.as_str() == "new_inherited"
-                                        || i.name.as_str() == "new_initialized" => {
+            visit::FnKind::ItemFn(i, _, _, _, _, _) |
+            visit::FnKind::Method(i, _, _) if i.name.as_str() == "new"
+                                           || i.name.as_str() == "new_inherited"
+                                           || i.name.as_str() == "new_initialized" => {
                self.in_new_function = true;
                return;
            },
-            visit::FkItemFn(_, _, style, _, _, _) => match style {
+            visit::FnKind::ItemFn(_, _, style, _, _, _) => match style {
                ast::Unsafety::Unsafe => return,
                _ => ()
            },
--- a/servo/components/plugins/utils.rs
+++ b/servo/components/plugins/utils.rs
@ -5,6 +5,7 @@
 use rustc::ast_map;
 use rustc::lint::Context;
 use rustc::middle::def;
+use rustc::middle::def_id::DefId;

 use syntax::ast;
 use syntax::ast::{TyPath, Path, AngleBracketedParameters, PathSegment, Ty};
@ -52,7 +53,7 @@ pub fn match_lang_ty(cx: &Context, ty: &Ty, value: &str) -> bool {
    match_lang_did(cx, def_id, value)
 }

-pub fn match_lang_did(cx: &Context, did: ast::DefId, value: &str) -> bool {
+pub fn match_lang_did(cx: &Context, did: DefId, value: &str) -> bool {
    cx.tcx.get_attrs(did).iter().any(|attr| {
        match attr.node.value.node {
            ast::MetaNameValue(ref name, ref val) if &**name == "servo_lang" => {
@ -96,7 +97,7 @@ pub fn unsafe_context(map: &ast_map::Map, id: ast::NodeId) -> bool {
 /// check if a DefId's path matches the given absolute type path
 /// usage e.g. with
 /// `match_def_path(cx, id, &["core", "option", "Option"])`
-pub fn match_def_path(cx: &Context, def_id: ast::DefId, path: &[&str]) -> bool {
+pub fn match_def_path(cx: &Context, def_id: DefId, path: &[&str]) -> bool {
    cx.tcx.with_path(def_id, |iter| iter.map(|elem| elem.name())
        .zip(path.iter()).all(|(nm, p)| &nm.as_str() == p))
 }
--- a/servo/components/profile/time.rs
+++ b/servo/components/profile/time.rs
@ -12,7 +12,6 @@ use std::cmp::Ordering;
 use std::collections::BTreeMap;
 use std::f64;
 use std::thread::sleep_ms;
-use std_time::precise_time_ns;
 use util::task::spawn_named;

 pub trait Formattable {
--- a/servo/components/script/dom/bindings/conversions.rs
+++ b/servo/components/script/dom/bindings/conversions.rs
@ -60,6 +60,7 @@ use libc;
 use num::Float;
 use num::traits::{Bounded, Zero};
 use std::borrow::ToOwned;
+use std::char;
 use std::ptr;
 use std::rc::Rc;
 use std::slice;
@ -122,7 +123,7 @@ pub trait ToJSValConvertible {
 }

 /// A trait to convert `JSVal`s to Rust types.
-pub trait FromJSValConvertible {
+pub trait FromJSValConvertible: Sized {
    /// Optional configurable behaviour switch; use () for no configuration.
    type Config;
    /// Convert `val` to type `Self`.
@ -452,11 +453,10 @@ pub fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString {
            slice::from_raw_parts(chars as *const u16, length as usize)
        };
        let mut s = String::with_capacity(length as usize);
-        for item in ::rustc_unicode::str::utf16_items(potentially_ill_formed_utf16) {
-            use ::rustc_unicode::str::Utf16Item::*;
+        for item in char::decode_utf16(potentially_ill_formed_utf16.iter().cloned()) {
            match item {
-                ScalarValue(c) => s.push(c),
-                LoneSurrogate(_) => {
+                Ok(c) => s.push(c),
+                Err(_) => {
                    // FIXME: Add more info like document URL in the message?
                    macro_rules! message {
                        () => {
--- a/servo/components/script/dom/bindings/trace.rs
+++ b/servo/components/script/dom/bindings/trace.rs
@ -282,7 +282,7 @@ no_jsmanaged_fields!(Size2D<T>);
 no_jsmanaged_fields!(Arc<T>);
 no_jsmanaged_fields!(Image, ImageCacheChan, ImageCacheTask);
 no_jsmanaged_fields!(Atom, Namespace);
-no_jsmanaged_fields!(Trusted<T>);
+no_jsmanaged_fields!(Trusted<T: Reflectable>);
 no_jsmanaged_fields!(PropertyDeclarationBlock);
 no_jsmanaged_fields!(HashSet<T>);
 // These three are interdependent, if you plan to put jsmanaged data
--- a/servo/components/script/dom/element.rs
+++ b/servo/components/script/dom/element.rs
@ -637,7 +637,7 @@ impl Element {
                                    .iter()
                                    .position(|decl| decl.name() == property);
            if let Some(index) = index {
-                Arc::make_unique(&mut declarations.normal).remove(index);
+                Arc::make_mut(&mut declarations.normal).remove(index);
                return;
            }

@ -645,7 +645,7 @@ impl Element {
                                    .iter()
                                    .position(|decl| decl.name() == property);
            if let Some(index) = index {
-                Arc::make_unique(&mut declarations.important).remove(index);
+                Arc::make_mut(&mut declarations.important).remove(index);
                return;
            }
        }
@ -662,7 +662,7 @@ impl Element {

            // Usually, the reference count will be 1 here. But transitions could make it greater
            // than that.
-            let existing_declarations = Arc::make_unique(existing_declarations);
+            let existing_declarations = Arc::make_mut(existing_declarations);
            for declaration in &mut *existing_declarations {
                if declaration.name() == property_decl.name() {
                    *declaration = property_decl;
@ -696,8 +696,8 @@ impl Element {

            // Usually, the reference counts of `from` and `to` will be 1 here. But transitions
            // could make them greater than that.
-            let from = Arc::make_unique(from);
-            let to = Arc::make_unique(to);
+            let from = Arc::make_mut(from);
+            let to = Arc::make_mut(to);
            let mut new_from = Vec::new();
            for declaration in from.drain(..) {
                if properties.contains(&declaration.name()) {
--- a/servo/components/script/dom/macros.rs
+++ b/servo/components/script/dom/macros.rs
@ -223,6 +223,14 @@ macro_rules! no_jsmanaged_fields(
            }
        }
    );
+    ($ty:ident<$($gen:ident: $bound:ident),+>) => (
+        impl<$($gen: $bound),+> $crate::dom::bindings::trace::JSTraceable for $ty<$($gen),+> {
+            #[inline]
+            fn trace(&self, _: *mut ::js::jsapi::JSTracer) {
+                // Do nothing
+            }
+        }
+    );
 );

 /// These are used to generate a event handler which has no special case.
--- a/servo/components/script/lib.rs
+++ b/servo/components/script/lib.rs
@ -15,6 +15,7 @@
 #![feature(core_intrinsics)]
 #![feature(custom_attribute)]
 #![feature(custom_derive)]
+#![feature(decode_utf16)]
 #![feature(drain)]
 #![feature(fnbox)]
 #![feature(hashmap_hasher)]
--- a/servo/components/servo/Cargo.lock
+++ b/servo/components/servo/Cargo.lock
@ -73,7 +73,7 @@ dependencies = [

 [[package]]
 name = "aster"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -89,7 +89,7 @@ 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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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)",
@ -101,9 +101,9 @@ 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.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -142,7 +142,7 @@ dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "util 0.0.1",
 ]
@ -159,7 +159,7 @@ dependencies = [
 "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)",
 "plugins 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]
@ -237,7 +237,7 @@ dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "profile_traits 0.0.1",
@ -254,7 +254,7 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "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)",
+ "rustc-serialize 0.3.16 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -293,7 +293,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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -319,8 +319,8 @@ dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -336,8 +336,8 @@ dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
 "msg 0.0.1",
 "plugins 0.0.1",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -449,10 +449,10 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -565,10 +565,10 @@ dependencies = [
 "net_traits 0.0.1",
 "plugins 0.0.1",
 "profile_traits 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "script_traits 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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)",
@ -749,25 +749,25 @@ dependencies = [

 [[package]]
 name = "html5ever"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "html5ever_macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever_macros 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "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)",
+ "rustc-serialize 0.3.16 (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)",
+ "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "html5ever_macros"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -790,9 +790,9 @@ dependencies = [
 "mime 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "solicit 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solicit 0.4.3 (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)",
 "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -821,8 +821,8 @@ dependencies = [
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -835,7 +835,7 @@ dependencies = [
 "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)",
 "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -872,7 +872,7 @@ dependencies = [
 "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
 "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)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (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)",
 ]
@ -900,11 +900,11 @@ dependencies = [
 "net_traits 0.0.1",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "script 0.0.1",
 "script_traits 0.0.1",
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -927,7 +927,7 @@ dependencies = [
 "net_traits 0.0.1",
 "profile_traits 0.0.1",
 "script_traits 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -1032,8 +1032,8 @@ dependencies = [
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "style 0.0.1",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1056,7 +1056,7 @@ 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)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -1091,7 +1091,7 @@ 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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1100,11 +1100,11 @@ dependencies = [

 [[package]]
 name = "num"
-version = "0.1.25"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1146,7 +1146,7 @@ dependencies = [
 [[package]]
 name = "offscreen_gl_context"
 version = "0.1.0"
-source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#9efc32ebf723a125d9b9557f39b424eebd0e5c00"
+source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#9704865b61736568164f3bc4d1c81e28737fed69"
 dependencies = [
 "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1157,7 +1157,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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1217,7 +1217,7 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "phf_shared 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1253,7 +1253,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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1282,7 +1282,7 @@ name = "profile_traits"
 version = "0.0.1"
 dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1298,7 +1298,7 @@ name = "quasi_codegen"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aster 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1314,13 +1314,13 @@ name = "quickersort"
 version = "1.0.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)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "rand"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1358,7 +1358,7 @@ dependencies = [

 [[package]]
 name = "rustc-serialize"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1374,7 +1374,7 @@ dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "html5ever 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.6.8 (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)",
@ -1382,20 +1382,20 @@ dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "plugins 0.0.1",
 "profile_traits 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (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.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)",
+ "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1423,7 +1423,7 @@ dependencies = [
 "msg 0.0.1",
 "net_traits 0.0.1",
 "profile_traits 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -1446,10 +1446,10 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1457,7 +1457,7 @@ name = "serde_codegen"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aster 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1467,8 +1467,8 @@ name = "serde_json"
 version = "0.5.1"
 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.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1521,7 +1521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "solicit"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1542,7 +1542,7 @@ 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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (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)",
 ]
@ -1579,11 +1579,11 @@ dependencies = [
 "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1618,7 +1618,7 @@ name = "tempdir"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1628,7 +1628,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "kernel32-sys 0.1.3 (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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1639,7 +1639,7 @@ source = "git+https://github.com/servo/rust-tenacious#a04fe4a6e6c332f94b491b9369

 [[package]]
 name = "tendril"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1695,8 +1695,8 @@ 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)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1717,7 +1717,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)",
 "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)",
+ "html5ever 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.6.8 (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)",
@ -1725,13 +1725,13 @@ dependencies = [
 "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)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1753,8 +1753,8 @@ name = "uuid"
 version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1797,13 +1797,13 @@ dependencies = [

 [[package]]
 name = "webdriver"
-version = "0.2.2"
-source = "git+https://github.com/jgraham/webdriver-rust.git#2265894866bea9659c06a7082f2f96cad238ff34"
+version = "0.2.3"
+source = "git+https://github.com/jgraham/webdriver-rust.git#7fd0a2aec5722f28a319595cba173e95367b99a7"
 dependencies = [
 "hyper 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1815,11 +1815,11 @@ dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 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)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "webdriver 0.2.2 (git+https://github.com/jgraham/webdriver-rust.git)",
+ "webdriver 0.2.3 (git+https://github.com/jgraham/webdriver-rust.git)",
 ]

 [[package]]
@ -1831,8 +1831,8 @@ dependencies = [
 "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl 0.6.4 (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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/servo/components/style/animation.rs
+++ b/servo/components/style/animation.rs
@ -367,7 +367,7 @@ impl AnimatedProperty {
    }
 }

-trait Interpolate {
+trait Interpolate: Sized {
    fn interpolate(&self, other: &Self, time: f64) -> Option<Self>;
 }

--- a/servo/components/style/properties.mako.rs
+++ b/servo/components/style/properties.mako.rs
@ -169,7 +169,7 @@ pub mod longhands {
                                           .clone()
                        }
                    };
-                    Arc::make_unique(&mut style.${THIS_STYLE_STRUCT.ident}).${property.ident} =
+                    Arc::make_mut(&mut style.${THIS_STYLE_STRUCT.ident}).${property.ident} =
                        computed_value;

                    % if custom_cascade:
@ -504,11 +504,11 @@ pub mod longhands {
                                   context: &computed::Context,
                                   _seen: &mut PropertyBitField,
                                   _cacheable: &mut bool) {
-            Arc::make_unique(&mut style.box_)._servo_display_for_hypothetical_box =
+            Arc::make_mut(&mut style.box_)._servo_display_for_hypothetical_box =
                longhands::_servo_display_for_hypothetical_box::derive_from_display(
                    *computed_value,
                    &context);
-            Arc::make_unique(&mut style.inheritedtext)._servo_text_decorations_in_effect =
+            Arc::make_mut(&mut style.inheritedtext)._servo_text_decorations_in_effect =
                longhands::_servo_text_decorations_in_effect::derive_from_display(*computed_value,
                                                                                  &context);
        }
@ -2218,7 +2218,7 @@ pub mod longhands {
                                   context: &computed::Context,
                                   _seen: &mut PropertyBitField,
                                   _cacheable: &mut bool) {
-            Arc::make_unique(&mut style.inheritedtext)._servo_text_decorations_in_effect =
+            Arc::make_mut(&mut style.inheritedtext)._servo_text_decorations_in_effect =
                longhands::_servo_text_decorations_in_effect::derive_from_text_decoration(
                    *computed_value,
                    &context);
@ -5979,7 +5979,7 @@ impl ComputedValues {
    #[inline]
    pub fn mutate_${style_struct.name.lower()}
            <'a>(&'a mut self) -> &'a mut style_structs::${style_struct.name} {
-        &mut *Arc::make_unique(&mut self.${style_struct.ident})
+        &mut *Arc::make_mut(&mut self.${style_struct.ident})
    }
    % endfor

@ -6101,7 +6101,7 @@ fn cascade_with_cached_declarations(
                                                        .clone()
                                        }
                                    };
-                                    Arc::make_unique(&mut style_${style_struct.ident})
+                                    Arc::make_mut(&mut style_${style_struct.ident})
                                        .${property.ident} = computed_value;
                                % endif

@ -6112,7 +6112,7 @@ fn cascade_with_cached_declarations(
                                            .${property.ident}.clone();
                                    % endif
                                    % for derived in DERIVED_LONGHANDS[property.name]:
-                                        Arc::make_unique(&mut style_${derived.style_struct.ident})
+                                        Arc::make_mut(&mut style_${derived.style_struct.ident})
                                             .${derived.ident} =
                                            longhands::${derived.ident}
                                                     ::derive_from_${property.ident}(
@ -6134,7 +6134,7 @@ fn cascade_with_cached_declarations(

    if seen.get_font_style() || seen.get_font_weight() || seen.get_font_stretch() ||
            seen.get_font_family() {
-        compute_font_hash(&mut *Arc::make_unique(&mut style_font))
+        compute_font_hash(&mut *Arc::make_mut(&mut style_font))
    }

    ComputedValues {
@ -6373,7 +6373,7 @@ pub fn cascade(viewport_size: Size2D<Au>,

    // The initial value of border-*-width may be changed at computed value time.
    {
-        let border = Arc::make_unique(&mut style.border);
+        let border = Arc::make_mut(&mut style.border);
        % for side in ["top", "right", "bottom", "left"]:
            // Like calling to_computed_value, which wouldn't type check.
            if !context.border_${side}_present {
@ -6384,13 +6384,13 @@ pub fn cascade(viewport_size: Size2D<Au>,

    // The initial value of display may be changed at computed value time.
    if !seen.get_display() {
-        let box_ = Arc::make_unique(&mut style.box_);
+        let box_ = Arc::make_mut(&mut style.box_);
        box_.display = box_.display.to_computed_value(&context);
    }

    // The initial value of outline width may be changed at computed value time.
    if !context.outline_style_present {
-        let outline = Arc::make_unique(&mut style.outline);
+        let outline = Arc::make_mut(&mut style.outline);
        outline.outline_width = Au(0);
    }

@ -6400,7 +6400,7 @@ pub fn cascade(viewport_size: Size2D<Au>,

    if seen.get_font_style() || seen.get_font_weight() || seen.get_font_stretch() ||
            seen.get_font_family() {
-        compute_font_hash(&mut *Arc::make_unique(&mut style.font))
+        compute_font_hash(&mut *Arc::make_mut(&mut style.font))
    }

    (ComputedValues {
@ -6423,16 +6423,16 @@ pub fn cascade(viewport_size: Size2D<Au>,
 pub fn modify_style_for_replaced_content(style: &mut Arc<ComputedValues>) {
    // Reset `position` to handle cases like `<div style="position: absolute">foo bar baz</div>`.
    if style.box_.display != longhands::display::computed_value::T::inline {
-        let mut style = Arc::make_unique(style);
-        Arc::make_unique(&mut style.box_).display = longhands::display::computed_value::T::inline;
-        Arc::make_unique(&mut style.box_).position =
+        let mut style = Arc::make_mut(style);
+        Arc::make_mut(&mut style.box_).display = longhands::display::computed_value::T::inline;
+        Arc::make_mut(&mut style.box_).position =
            longhands::position::computed_value::T::static_;
    }

    // Reset `vertical-align` to handle cases like `<sup>foo</sup>`.
    if style.box_.vertical_align != longhands::vertical_align::computed_value::T::baseline {
-        let mut style = Arc::make_unique(style);
-        Arc::make_unique(&mut style.box_).vertical_align =
+        let mut style = Arc::make_mut(style);
+        Arc::make_mut(&mut style.box_).vertical_align =
            longhands::vertical_align::computed_value::T::baseline
    }

@ -6441,8 +6441,8 @@ pub fn modify_style_for_replaced_content(style: &mut Arc<ComputedValues>) {
            style.margin.margin_left != computed::LengthOrPercentageOrAuto::Length(Au(0)) ||
            style.margin.margin_bottom != computed::LengthOrPercentageOrAuto::Length(Au(0)) ||
            style.margin.margin_right != computed::LengthOrPercentageOrAuto::Length(Au(0)) {
-        let mut style = Arc::make_unique(style);
-        let margin = Arc::make_unique(&mut style.margin);
+        let mut style = Arc::make_mut(style);
+        let margin = Arc::make_mut(&mut style.margin);
        margin.margin_top = computed::LengthOrPercentageOrAuto::Length(Au(0));
        margin.margin_left = computed::LengthOrPercentageOrAuto::Length(Au(0));
        margin.margin_bottom = computed::LengthOrPercentageOrAuto::Length(Au(0));
@ -6460,39 +6460,39 @@ pub fn modify_style_for_inline_sides(style: &mut Arc<ComputedValues>,
                                     is_first_fragment_of_element: bool,
                                     is_last_fragment_of_element: bool) {
    fn modify_side(style: &mut Arc<ComputedValues>, side: PhysicalSide) {
-        let mut style = Arc::make_unique(style);
-        let border = Arc::make_unique(&mut style.border);
+        let mut style = Arc::make_mut(style);
+        let border = Arc::make_mut(&mut style.border);
        match side {
            PhysicalSide::Left => {
                border.border_left_width = Au(0);
                border.border_left_style = BorderStyle::none;
-                Arc::make_unique(&mut style.padding).padding_left =
+                Arc::make_mut(&mut style.padding).padding_left =
                    computed::LengthOrPercentage::Length(Au(0));
-                Arc::make_unique(&mut style.margin).margin_left =
+                Arc::make_mut(&mut style.margin).margin_left =
                    computed::LengthOrPercentageOrAuto::Length(Au(0))
            }
            PhysicalSide::Right => {
                border.border_right_width = Au(0);
                border.border_right_style = BorderStyle::none;
-                Arc::make_unique(&mut style.padding).padding_right =
+                Arc::make_mut(&mut style.padding).padding_right =
                    computed::LengthOrPercentage::Length(Au(0));
-                Arc::make_unique(&mut style.margin).margin_right =
+                Arc::make_mut(&mut style.margin).margin_right =
                    computed::LengthOrPercentageOrAuto::Length(Au(0))
            }
            PhysicalSide::Bottom => {
                border.border_bottom_width = Au(0);
                border.border_bottom_style = BorderStyle::none;
-                Arc::make_unique(&mut style.padding).padding_bottom =
+                Arc::make_mut(&mut style.padding).padding_bottom =
                    computed::LengthOrPercentage::Length(Au(0));
-                Arc::make_unique(&mut style.margin).margin_bottom =
+                Arc::make_mut(&mut style.margin).margin_bottom =
                    computed::LengthOrPercentageOrAuto::Length(Au(0))
            }
            PhysicalSide::Top => {
                border.border_top_width = Au(0);
                border.border_top_style = BorderStyle::none;
-                Arc::make_unique(&mut style.padding).padding_top =
+                Arc::make_mut(&mut style.padding).padding_top =
                    computed::LengthOrPercentage::Length(Au(0));
-                Arc::make_unique(&mut style.margin).margin_top =
+                Arc::make_mut(&mut style.margin).margin_top =
                    computed::LengthOrPercentageOrAuto::Length(Au(0))
            }
        }
@ -6514,8 +6514,8 @@ pub fn modify_style_for_inline_sides(style: &mut Arc<ComputedValues>,
 pub fn modify_style_for_anonymous_table_object(
        style: &mut Arc<ComputedValues>,
        new_display_value: longhands::display::computed_value::T) {
-    let mut style = Arc::make_unique(style);
-    let box_style = Arc::make_unique(&mut style.box_);
+    let mut style = Arc::make_mut(style);
+    let box_style = Arc::make_mut(&mut style.box_);
    box_style.display = new_display_value;
    box_style.position = longhands::position::computed_value::T::static_;
 }
@ -6523,8 +6523,8 @@ pub fn modify_style_for_anonymous_table_object(
 /// Adjusts the `position` property as necessary for the outer fragment wrapper of an inline-block.
 #[inline]
 pub fn modify_style_for_outer_inline_block_fragment(style: &mut Arc<ComputedValues>) {
-    let mut style = Arc::make_unique(style);
-    let box_style = Arc::make_unique(&mut style.box_);
+    let mut style = Arc::make_mut(style);
+    let box_style = Arc::make_mut(&mut style.box_);
    box_style.position = longhands::position::computed_value::T::static_
 }

@ -6537,8 +6537,8 @@ pub fn modify_style_for_text(style: &mut Arc<ComputedValues>) {
    if style.box_.position == longhands::position::computed_value::T::relative {
        // We leave the `position` property set to `relative` so that we'll still establish a
        // containing block if needed. But we reset all position offsets to `auto`.
-        let mut style = Arc::make_unique(style);
-        let mut position_offsets = Arc::make_unique(&mut style.positionoffsets);
+        let mut style = Arc::make_mut(style);
+        let mut position_offsets = Arc::make_mut(&mut style.positionoffsets);
        position_offsets.top = computed::LengthOrPercentageOrAuto::Auto;
        position_offsets.right = computed::LengthOrPercentageOrAuto::Auto;
        position_offsets.bottom = computed::LengthOrPercentageOrAuto::Auto;
@ -6551,8 +6551,8 @@ pub fn modify_style_for_text(style: &mut Arc<ComputedValues>) {
 /// Margins apply to the `input` element itself, so including them in the text will cause them to
 /// be double-counted.
 pub fn modify_style_for_input_text(style: &mut Arc<ComputedValues>) {
-    let mut style = Arc::make_unique(style);
-    let margin_style = Arc::make_unique(&mut style.margin);
+    let mut style = Arc::make_mut(style);
+    let margin_style = Arc::make_mut(&mut style.margin);
    margin_style.margin_top = computed::LengthOrPercentageOrAuto::Length(Au(0));
    margin_style.margin_right = computed::LengthOrPercentageOrAuto::Length(Au(0));
    margin_style.margin_bottom = computed::LengthOrPercentageOrAuto::Length(Au(0));
@ -6563,8 +6563,8 @@ pub fn modify_style_for_input_text(style: &mut Arc<ComputedValues>) {
 /// children.
 pub fn modify_style_for_inline_absolute_hypothetical_fragment(style: &mut Arc<ComputedValues>) {
    if style.get_effects().clip.0.is_some() {
-        let mut style = Arc::make_unique(style);
-        let effects_style = Arc::make_unique(&mut style.effects);
+        let mut style = Arc::make_mut(style);
+        let effects_style = Arc::make_mut(&mut style.effects);
        effects_style.clip.0 = None
    }
 }
--- a/servo/components/style/stylesheets.rs
+++ b/servo/components/style/stylesheets.rs
@ -266,7 +266,7 @@ pub mod rule_filter {
 }

 /// Extension methods for `CSSRule` iterators.
-pub trait CSSRuleIteratorExt<'a>: Iterator<Item=&'a CSSRule> {
+pub trait CSSRuleIteratorExt<'a>: Iterator<Item=&'a CSSRule> + Sized {
    /// Yield only @font-face rules.
    fn font_face(self) -> rule_filter::FontFace<'a, Self>;

--- a/servo/ports/cef/Cargo.lock
+++ b/servo/ports/cef/Cargo.lock
@ -65,7 +65,7 @@ dependencies = [

 [[package]]
 name = "aster"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -81,7 +81,7 @@ 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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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)",
@ -93,9 +93,9 @@ 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.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -134,7 +134,7 @@ dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "util 0.0.1",
 ]
@ -151,7 +151,7 @@ dependencies = [
 "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)",
 "plugins 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]
@ -229,7 +229,7 @@ dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "profile_traits 0.0.1",
@ -246,7 +246,7 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "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)",
+ "rustc-serialize 0.3.16 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -285,7 +285,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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -311,8 +311,8 @@ dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -328,8 +328,8 @@ dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
 "msg 0.0.1",
 "plugins 0.0.1",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -441,10 +441,10 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -557,10 +557,10 @@ dependencies = [
 "net_traits 0.0.1",
 "plugins 0.0.1",
 "profile_traits 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "script_traits 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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)",
@ -734,25 +734,25 @@ dependencies = [

 [[package]]
 name = "html5ever"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "html5ever_macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever_macros 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "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)",
+ "rustc-serialize 0.3.16 (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)",
+ "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "html5ever_macros"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -775,9 +775,9 @@ dependencies = [
 "mime 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "solicit 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solicit 0.4.3 (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)",
 "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -806,8 +806,8 @@ dependencies = [
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -820,7 +820,7 @@ dependencies = [
 "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)",
 "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -857,7 +857,7 @@ dependencies = [
 "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
 "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)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (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)",
 ]
@ -885,11 +885,11 @@ dependencies = [
 "net_traits 0.0.1",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "script 0.0.1",
 "script_traits 0.0.1",
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -912,7 +912,7 @@ dependencies = [
 "net_traits 0.0.1",
 "profile_traits 0.0.1",
 "script_traits 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -1017,8 +1017,8 @@ dependencies = [
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "style 0.0.1",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1041,7 +1041,7 @@ 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)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -1061,7 +1061,7 @@ 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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1070,11 +1070,11 @@ dependencies = [

 [[package]]
 name = "num"
-version = "0.1.25"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1116,7 +1116,7 @@ dependencies = [
 [[package]]
 name = "offscreen_gl_context"
 version = "0.1.0"
-source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#9efc32ebf723a125d9b9557f39b424eebd0e5c00"
+source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#9704865b61736568164f3bc4d1c81e28737fed69"
 dependencies = [
 "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1127,7 +1127,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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1187,7 +1187,7 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "phf_shared 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1223,7 +1223,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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1252,7 +1252,7 @@ name = "profile_traits"
 version = "0.0.1"
 dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1268,7 +1268,7 @@ name = "quasi_codegen"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aster 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1284,13 +1284,13 @@ name = "quickersort"
 version = "1.0.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)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "rand"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1328,7 +1328,7 @@ dependencies = [

 [[package]]
 name = "rustc-serialize"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1344,7 +1344,7 @@ dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "html5ever 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.6.8 (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)",
@ -1352,20 +1352,20 @@ dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "plugins 0.0.1",
 "profile_traits 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (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.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)",
+ "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1385,7 +1385,7 @@ dependencies = [
 "msg 0.0.1",
 "net_traits 0.0.1",
 "profile_traits 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -1408,10 +1408,10 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1419,7 +1419,7 @@ name = "serde_codegen"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aster 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1429,8 +1429,8 @@ name = "serde_json"
 version = "0.5.1"
 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.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1516,7 +1516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "solicit"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1537,7 +1537,7 @@ 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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (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)",
 ]
@ -1574,11 +1574,11 @@ dependencies = [
 "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1599,7 +1599,7 @@ name = "tempdir"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1609,7 +1609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "kernel32-sys 0.1.3 (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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1620,7 +1620,7 @@ source = "git+https://github.com/servo/rust-tenacious#a04fe4a6e6c332f94b491b9369

 [[package]]
 name = "tendril"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1676,8 +1676,8 @@ 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)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1698,7 +1698,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)",
 "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)",
+ "html5ever 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.6.8 (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)",
@ -1706,13 +1706,13 @@ dependencies = [
 "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)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1724,8 +1724,8 @@ name = "uuid"
 version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1768,13 +1768,13 @@ dependencies = [

 [[package]]
 name = "webdriver"
-version = "0.2.2"
-source = "git+https://github.com/jgraham/webdriver-rust.git#2265894866bea9659c06a7082f2f96cad238ff34"
+version = "0.2.3"
+source = "git+https://github.com/jgraham/webdriver-rust.git#7fd0a2aec5722f28a319595cba173e95367b99a7"
 dependencies = [
 "hyper 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1786,11 +1786,11 @@ dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 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)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "webdriver 0.2.2 (git+https://github.com/jgraham/webdriver-rust.git)",
+ "webdriver 0.2.3 (git+https://github.com/jgraham/webdriver-rust.git)",
 ]

 [[package]]
@ -1802,8 +1802,8 @@ dependencies = [
 "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl 0.6.4 (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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/servo/ports/gonk/Cargo.lock
+++ b/servo/ports/gonk/Cargo.lock
@ -51,7 +51,7 @@ dependencies = [

 [[package]]
 name = "aster"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -67,7 +67,7 @@ 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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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)",
@ -79,9 +79,9 @@ 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.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -115,7 +115,7 @@ dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "util 0.0.1",
 ]
@ -132,7 +132,7 @@ dependencies = [
 "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)",
 "plugins 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]
@ -199,7 +199,7 @@ dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "profile_traits 0.0.1",
@ -216,7 +216,7 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "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)",
+ "rustc-serialize 0.3.16 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -255,7 +255,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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -281,8 +281,8 @@ dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -298,8 +298,8 @@ dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
 "msg 0.0.1",
 "plugins 0.0.1",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -396,10 +396,10 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -504,10 +504,10 @@ dependencies = [
 "net_traits 0.0.1",
 "plugins 0.0.1",
 "profile_traits 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "script_traits 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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)",
@ -618,25 +618,25 @@ dependencies = [

 [[package]]
 name = "html5ever"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "html5ever_macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever_macros 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "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)",
+ "rustc-serialize 0.3.16 (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)",
+ "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "html5ever_macros"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -659,9 +659,9 @@ dependencies = [
 "mime 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "solicit 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solicit 0.4.3 (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)",
 "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -690,8 +690,8 @@ dependencies = [
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -704,7 +704,7 @@ dependencies = [
 "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)",
 "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -741,7 +741,7 @@ dependencies = [
 "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
 "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)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (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)",
 ]
@ -769,11 +769,11 @@ dependencies = [
 "net_traits 0.0.1",
 "plugins 0.0.1",
 "profile_traits 0.0.1",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "script 0.0.1",
 "script_traits 0.0.1",
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -796,7 +796,7 @@ dependencies = [
 "net_traits 0.0.1",
 "profile_traits 0.0.1",
 "script_traits 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -892,8 +892,8 @@ dependencies = [
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "style 0.0.1",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -916,7 +916,7 @@ 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)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -936,7 +936,7 @@ 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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -945,11 +945,11 @@ dependencies = [

 [[package]]
 name = "num"
-version = "0.1.25"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -991,7 +991,7 @@ dependencies = [
 [[package]]
 name = "offscreen_gl_context"
 version = "0.1.0"
-source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#9efc32ebf723a125d9b9557f39b424eebd0e5c00"
+source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#9704865b61736568164f3bc4d1c81e28737fed69"
 dependencies = [
 "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1002,7 +1002,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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1053,7 +1053,7 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "phf_shared 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1089,7 +1089,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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1118,7 +1118,7 @@ name = "profile_traits"
 version = "0.0.1"
 dependencies = [
 "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1134,7 +1134,7 @@ name = "quasi_codegen"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aster 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1150,13 +1150,13 @@ name = "quickersort"
 version = "1.0.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)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "rand"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1194,7 +1194,7 @@ dependencies = [

 [[package]]
 name = "rustc-serialize"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1210,7 +1210,7 @@ dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "euclid 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "html5ever 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.6.8 (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)",
@ -1218,20 +1218,20 @@ dependencies = [
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
 "plugins 0.0.1",
 "profile_traits 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (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.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)",
+ "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1251,7 +1251,7 @@ dependencies = [
 "msg 0.0.1",
 "net_traits 0.0.1",
 "profile_traits 0.0.1",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
@ -1274,10 +1274,10 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1285,7 +1285,7 @@ name = "serde_codegen"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aster 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1295,8 +1295,8 @@ name = "serde_json"
 version = "0.5.1"
 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.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1362,7 +1362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "solicit"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1383,7 +1383,7 @@ 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.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (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)",
 ]
@ -1420,11 +1420,11 @@ dependencies = [
 "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "plugins 0.0.1",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1445,7 +1445,7 @@ name = "tempdir"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1455,7 +1455,7 @@ source = "git+https://github.com/servo/rust-tenacious#a04fe4a6e6c332f94b491b9369

 [[package]]
 name = "tendril"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1511,8 +1511,8 @@ 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)",
- "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1533,7 +1533,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)",
 "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)",
+ "html5ever 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.6.8 (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)",
@ -1541,13 +1541,13 @@ dependencies = [
 "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)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "serde 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_macros 0.5.1 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1559,8 +1559,8 @@ name = "uuid"
 version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1577,8 +1577,8 @@ dependencies = [
 "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl 0.6.4 (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)",
+ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/servo/rust-snapshot-hash
+++ b/servo/rust-snapshot-hash
@ -1 +1 @@
-7b7fc67dd453c470a48dbdcf64693a93293c9ab0/rustc-1.4.0-dev
+cb9323ec096dbc4b3766b770309102c7e2ed9875/rustc-1.4.0-dev
--- a/servo/tests/unit/net/resource_task.rs
+++ b/servo/tests/unit/net/resource_task.rs
@ -155,8 +155,6 @@ fn test_parse_hostsfile_with_end_of_line_whitespace()

 #[test]
 fn test_replace_hosts() {
-    use std::net::TcpListener;
-
    let mut host_table_box = Box::new(HashMap::new());
    host_table_box.insert("foo.bar.com".to_owned(), "127.0.0.1".to_owned());
    host_table_box.insert("servo.test.server".to_owned(), "127.0.0.2".to_owned());