Auto merge of #6254 - servo:rustup_20150601, r=SimonSapin

[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6254)
2025-08-06 06:00:15 +01:00 · 2015-06-02 12:53:37 -05:00 · 2015-06-02 12:53:37 -05:00 · 20f63459ef
commit 20f63459ef
parent 97e8a0cb77 f80f99fe1e
15 changed files with 178 additions and 237 deletions
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@ -20,4 +20,4 @@ path = "../util"
 time = "*"
 rustc-serialize = "0.3"
 url = "*"
-hyper = "0.4"
+hyper = "0.5"
--- a/components/devtools_traits/Cargo.toml
+++ b/components/devtools_traits/Cargo.toml
@ -17,5 +17,5 @@ path = "../util"
 time = "*"
 rustc-serialize = "0.3"
 url = "*"
-hyper = "0.4"
+hyper = "0.5"
 bitflags = "*"
--- a/components/layout/incremental.rs
+++ b/components/layout/incremental.rs
@ -89,7 +89,7 @@ impl RestyleDamage {
    }
 }

-impl fmt::Debug for RestyleDamage {
+impl fmt::Display for RestyleDamage {
    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
        let mut first_elem = true;

--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@ -34,5 +34,5 @@ git = "https://github.com/servo/rust-png"
 [dependencies]
 url = "0.2.16"
 bitflags = "*"
-hyper = "0.4"
+hyper = "0.5"
 rustc-serialize = "0.3.4"
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@ -30,6 +30,6 @@ rustc-serialize = "0.3"
 cookie="*"
 regex = "0.1.14"
 regex_macros = "0.1.8"
-hyper = "0.4"
+hyper = "0.5"
 flate2 = "0.2.0"
 uuid = "0.1.16"
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@ -131,7 +131,7 @@ reason: \"certificate verify failed\" }]))";
        let mut connector = if opts::get().nossl {
            HttpConnector(None)
        } else {
-            HttpConnector(Some(box verifier as Box<FnMut(&mut SslContext) + Send>))
+            HttpConnector(Some(box verifier as Box<Fn(&mut SslContext) + Send>))
        };

        let mut req = match Request::with_connector(load_data.method.clone(), url.clone(), &mut connector) {
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@ -24,4 +24,4 @@ git = "https://github.com/servo/rust-stb-image"

 [dependencies]
 url = "0.2.16"
-hyper = "0.4"
+hyper = "0.5"
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@ -79,9 +79,9 @@ time = "0.1.12"
 bitflags = "*"
 rustc-serialize = "*"
 libc = "*"
-hyper = "0.4"
+hyper = "0.5"
 cssparser = "0.3.1"
 unicase = "0.1"
 num = "0.1.24"
-websocket = "0.11.0"
+websocket = "0.12"
 uuid = "0.1.16"
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@ -3,7 +3,7 @@ name = "servo"
 version = "0.0.1"
 dependencies = [
 "android_glue 0.0.2",
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "compositing 0.0.1",
 "devtools 0.0.1",
 "devtools_traits 0.0.1",
@ -23,7 +23,7 @@ dependencies = [
 "script_tests 0.0.1",
 "style_tests 0.0.1",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 "util_tests 0.0.1",
 "webdriver_server 0.0.1",
@ -60,6 +60,11 @@ name = "bitflags"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "bitflags"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "0.3.10"
@ -144,19 +149,19 @@ dependencies = [
 "script_traits 0.0.1",
 "style 0.0.1",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

 [[package]]
 name = "cookie"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -205,11 +210,11 @@ name = "devtools"
 version = "0.0.1"
 dependencies = [
 "devtools_traits 0.0.1",
- "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -217,12 +222,12 @@ dependencies = [
 name = "devtools_traits"
 version = "0.0.1"
 dependencies = [
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -370,7 +375,7 @@ name = "gfx"
 version = "0.0.1"
 dependencies = [
 "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "canvas_traits 0.0.1",
 "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
 "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
@ -395,7 +400,7 @@ dependencies = [
 "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
 "style 0.0.1",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -469,7 +474,7 @@ dependencies = [
 name = "glutin_app"
 version = "0.0.1"
 dependencies = [
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
 "compositing 0.0.1",
 "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
@ -482,7 +487,7 @@ dependencies = [
 "net 0.0.1",
 "script_traits 0.0.1",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -564,29 +569,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "hyper"
-version = "0.4.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cookie 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.0.11 (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.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "traitobject 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "typeable 0.1.1 (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.34 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "hyper"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cookie 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "httparse 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "mime 0.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -597,7 +583,7 @@ dependencies = [
 "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "typeable 0.1.1 (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.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -661,7 +647,7 @@ name = "layout"
 version = "0.0.1"
 dependencies = [
 "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "canvas 0.0.1",
 "canvas_traits 0.0.1",
 "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
@ -684,7 +670,7 @@ dependencies = [
 "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
 "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
 "style 0.0.1",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -698,7 +684,7 @@ dependencies = [
 "net_traits 0.0.1",
 "profile_traits 0.0.1",
 "script_traits 0.0.1",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -778,16 +764,16 @@ name = "msg"
 version = "0.0.1"
 dependencies = [
 "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
- "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
 "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "style 0.0.1",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -795,11 +781,11 @@ dependencies = [
 name = "net"
 version = "0.0.1"
 dependencies = [
- "cookie 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 "devtools_traits 0.0.1",
 "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
- "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "net_traits 0.0.1",
 "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
@ -807,7 +793,7 @@ dependencies = [
 "regex_macros 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (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)",
 ]
@ -816,11 +802,11 @@ dependencies = [
 name = "net_tests"
 version = "0.0.1"
 dependencies = [
- "cookie 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "net 0.0.1",
 "net_traits 0.0.1",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -829,11 +815,11 @@ name = "net_traits"
 version = "0.0.1"
 dependencies = [
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
- "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -994,7 +980,7 @@ name = "profile_traits"
 version = "0.0.1"
 dependencies = [
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1040,7 +1026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "script"
 version = "0.0.1"
 dependencies = [
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "canvas 0.0.1",
 "canvas_traits 0.0.1",
 "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1049,7 +1035,7 @@ dependencies = [
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
 "gfx 0.0.1",
 "html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
- "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
@ -1067,10 +1053,10 @@ dependencies = [
 "style 0.0.1",
 "time 0.1.25 (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.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (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)",
- "websocket 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "websocket 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1090,7 +1076,7 @@ dependencies = [
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "msg 0.0.1",
 "net_traits 0.0.1",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -1171,7 +1157,7 @@ source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc
 name = "style"
 version = "0.0.1"
 dependencies = [
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
@ -1183,7 +1169,7 @@ dependencies = [
 "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
 "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
 "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -1197,7 +1183,7 @@ dependencies = [
 "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
 "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
 "style 0.0.1",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "util 0.0.1",
 ]

@ -1235,11 +1221,6 @@ name = "traitobject"
 version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "traitobject"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "typeable"
 version = "0.1.1"
@ -1252,7 +1233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "url"
-version = "0.2.34"
+version = "0.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1274,7 +1255,7 @@ name = "util"
 version = "0.0.1"
 dependencies = [
 "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
@ -1291,7 +1272,7 @@ dependencies = [
 "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
 "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
 "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1314,9 +1295,9 @@ dependencies = [
 [[package]]
 name = "webdriver"
 version = "0.2.0"
-source = "git+https://github.com/jgraham/webdriver-rust.git#038c1828c5dd4ab7b8f70b3d859c0ff988e6ca25"
+source = "git+https://github.com/jgraham/webdriver-rust.git#b9cf2b1f65d4f01f593de29a581518feeb6b5a64"
 dependencies = [
- "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.5.2 (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.33 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1330,7 +1311,7 @@ dependencies = [
 "msg 0.0.1",
 "png 0.1.0 (git+https://github.com/servo/rust-png)",
 "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (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.0 (git+https://github.com/jgraham/webdriver-rust.git)",
@ -1338,17 +1319,17 @@ dependencies = [

 [[package]]
 name = "websocket"
-version = "0.11.11"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-serialize 0.3.14 (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.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1376,9 +1357,9 @@ dependencies = [
 [[package]]
 name = "xlib"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-xlib#1a0f3d48fbebf96e2d1bf83ac71309b27f49e0c7"
+source = "git+https://github.com/servo/rust-xlib#184533f276bfad3c78bf06e35ec68f09c18b89c4"
 dependencies = [
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1387,6 +1368,6 @@ name = "xml-rs"
 version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

--- a/components/util/logical_geometry.rs
+++ b/components/util/logical_geometry.rs
@ -7,7 +7,7 @@
 use geom::{Size2D, Point2D, SideOffsets2D, Rect};
 use geom::num::Zero;
 use std::cmp::{min, max};
-use std::fmt::{Debug, Formatter, Error};
+use std::fmt::{self, Debug, Formatter, Error};
 use std::ops::{Add, Sub};

 bitflags!(
@ -87,7 +87,7 @@ impl WritingMode {
    }
 }

-impl Debug for WritingMode {
+impl fmt::Display for WritingMode {
    fn fmt(&self, formatter: &mut Formatter) -> Result<(), Error> {
        if self.is_vertical() {
            try!(write!(formatter, "V"));
--- a/components/util/task_state.rs
+++ b/components/util/task_state.rs
@ -11,7 +11,6 @@
 pub use self::imp::{initialize, get, enter, exit};

 bitflags! {
-    #[derive(Debug)]
    flags TaskState: u32 {
        const SCRIPT          = 0x01,
        const LAYOUT          = 0x02,