Auto merge of #6459 - servo:rustup_20150625, r=SimonSapin

Update to rustc 2d0cbf3e3e25e092bd9e4c94d08e446b680869f0.



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

22 files changed, 232 insertions, 132 deletions

diff --git a/components/canvas/lib.rs b/components/canvas/lib.rs
index 4ef4afe390a..99f5881cca1 100644
--- a/components/canvas/lib.rs
+++ b/components/canvas/lib.rs
@@ -3,7 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(core)]
-#![feature(collections)]
+#![feature(nonzero)]
+#![feature(slice_bytes)]
+#![feature(vec_push_all)]
 
 extern crate core;
 extern crate canvas_traits;
diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs
index 91f3278b4c0..0fee050d78d 100644
--- a/components/canvas_traits/lib.rs
+++ b/components/canvas_traits/lib.rs
@@ -5,6 +5,7 @@
 #![crate_name = "canvas_traits"]
 #![crate_type = "rlib"]
 #![feature(core)]
+#![feature(nonzero)]
 extern crate core;
 extern crate azure;
 extern crate euclid;
diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs
index fbb8070892c..ba2934216e6 100644
--- a/components/compositing/lib.rs
+++ b/components/compositing/lib.rs
@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(box_syntax)]
-#![feature(collections)]
-#![feature(core)]
+#![feature(slice_bytes)]
+#![feature(vec_push_all)]
 
 #[macro_use]
 extern crate log;
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index fd3dba4f1be..f0fca1a9b0e 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -10,7 +10,11 @@
 #![crate_name = "devtools"]
 #![crate_type = "rlib"]
 
-#![feature(box_syntax, core)]
+#![feature(box_syntax)]
+#![feature(core)]
+#![feature(get_type_id)]
+#![feature(raw)]
+#![feature(reflect_marker)]
 
 #![allow(non_snake_case)]
 
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs
index 4acd4ef0aa7..dec7548cdae 100644
--- a/components/gfx/lib.rs
+++ b/components/gfx/lib.rs
@@ -3,13 +3,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(alloc)]
+#![feature(arc_weak)]
+#![feature(box_raw)]
 #![feature(box_syntax)]
-#![feature(collections)]
-#![feature(core)]
-#![feature(plugin, custom_attribute)]
+#![feature(custom_attribute)]
 #![feature(custom_derive)]
-#![feature(std_misc)]
+#![feature(float_consts)]
+#![feature(hashmap_hasher)]
+#![feature(heap_api)]
+#![feature(iter_cmp)]
+#![feature(plugin)]
 #![feature(str_char)]
+#![feature(vec_push_all)]
 
 #![plugin(plugins)]
 
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index dd3f6bec269..e93fe905633 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -3,12 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(alloc)]
+#![feature(append)]
+#![feature(arc_unique)]
 #![feature(box_syntax)]
-#![feature(collections)]
-#![feature(core)]
 #![feature(filling_drop)]
+#![feature(float_consts)]
+#![feature(hashmap_hasher)]
+#![feature(heap_api)]
+#![feature(mpsc_select)]
 #![feature(plugin)]
-#![feature(std_misc)]
+#![feature(raw)]
+#![feature(slice_chars)]
 #![feature(str_char)]
 #![feature(unsafe_no_drop_flag)]
 
diff --git a/components/net/lib.rs b/components/net/lib.rs
index 27b7cba4e98..45af99e1a70 100644
--- a/components/net/lib.rs
+++ b/components/net/lib.rs
@@ -2,13 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![feature(alloc)]
+#![feature(box_raw)]
 #![feature(box_syntax)]
-#![feature(collections)]
-#![feature(core)]
+#![feature(fnbox)]
+#![feature(mpsc_select)]
 #![feature(path_ext)]
 #![feature(plugin)]
-#![feature(std_misc)]
+#![feature(vec_push_all)]
 
 #![plugin(regex_macros)]
 
diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs
index cc5ba727453..6753b372ba8 100644
--- a/components/net_traits/lib.rs
+++ b/components/net_traits/lib.rs
@@ -3,9 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(box_syntax)]
-#![feature(collections)]
 #![feature(slice_patterns)]
 #![feature(step_by)]
+#![feature(vec_push_all)]
 
 extern crate euclid;
 extern crate hyper;
diff --git a/components/plugins/lints/transmute_type.rs b/components/plugins/lints/transmute_type.rs
index 0808e87cc09..6f1c8508074 100644
--- a/components/plugins/lints/transmute_type.rs
+++ b/components/plugins/lints/transmute_type.rs
@@ -6,7 +6,6 @@ use syntax::ast;
 use syntax::attr::AttrMetaMethods;
 use rustc::lint::{Context, LintPass, LintArray};
 use rustc::middle::ty::expr_ty;
-use rustc::util::ppaux::Repr;
 
 declare_lint!(TRANSMUTE_TYPE_LINT, Allow,
               "Warn and report types being transmuted");
@@ -32,9 +31,9 @@ impl LintPass for TransmutePass {
                            && args.len() == 1 {
                             let tcx = cx.tcx;
                             cx.span_lint(TRANSMUTE_TYPE_LINT, ex.span,
-                                         &format!("Transmute to {} from {} detected",
-                                                 expr_ty(tcx, ex).repr(tcx),
-                                                 expr_ty(tcx, &**args.get(0).unwrap()).repr(tcx)
+                                         &format!("Transmute to {:?} from {:?} detected",
+                                                 expr_ty(tcx, ex),
+                                                 expr_ty(tcx, &**args.get(0).unwrap())
                                         ));
                         }
                     }
diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs
index f9e9c7b6db1..436981ef504 100644
--- a/components/plugins/lints/unrooted_must_root.rs
+++ b/components/plugins/lints/unrooted_must_root.rs
@@ -8,7 +8,6 @@ use rustc::ast_map;
 use rustc::lint::{Context, LintPass, LintArray};
 use rustc::middle::ty::expr_ty;
 use rustc::middle::{ty, def};
-use rustc::util::ppaux::Repr;
 use utils::unsafe_context;
 
 declare_lint!(UNROOTED_MUST_ROOT, Deny,
@@ -163,7 +162,7 @@ impl LintPass for UnrootedPass {
             ty::TyEnum(did, _) => {
                 if ty::has_attr(cx.tcx, did, "must_root") {
                     cx.span_lint(UNROOTED_MUST_ROOT, expr.span,
-                                 &format!("Expression of type {} must be rooted", t.repr(cx.tcx)));
+                                 &format!("Expression of type {:?} must be rooted", t));
                 }
             }
             _ => {}
diff --git a/components/profile/lib.rs b/components/profile/lib.rs
index 22d7aa22224..a874ed233bb 100644
--- a/components/profile/lib.rs
+++ b/components/profile/lib.rs
@@ -3,9 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![feature(box_syntax)]
-#![feature(collections)]
-#![feature(core)]
+#![feature(iter_arith)]
 #![cfg_attr(target_os="linux", feature(page_size))]
+#![feature(slice_extras)]
 
 #[macro_use] extern crate log;
 
diff --git a/components/script/lib.rs b/components/script/lib.rs
index 8f693f7782d..def826fb377 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -2,13 +2,27 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![feature(alloc)]
+#![feature(append)]
+#![feature(arc_unique)]
+#![feature(as_unsafe_cell)]
+#![feature(borrow_state)]
+#![feature(box_raw)]
 #![feature(box_syntax)]
-#![feature(collections)]
 #![feature(core)]
+#![feature(core_intrinsics)]
 #![feature(custom_attribute)]
+#![feature(drain)]
+#![feature(hashmap_hasher)]
+#![feature(mpsc_select)]
+#![feature(nonzero)]
+#![feature(owned_ascii_ext)]
 #![feature(plugin)]
-#![feature(std_misc)]
+#![feature(rc_unique)]
+#![feature(slice_chars)]
+#![feature(slice_position_elem)]
+#![feature(str_utf16)]
+#![feature(vec_from_raw_buf)]
+#![feature(vec_push_all)]
 
 #![deny(unsafe_code)]
 #![allow(non_snake_case)]
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 379d9e0fa06..3466a62efbe 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -31,6 +31,14 @@ dependencies = [
 ]
 
 [[package]]
+name = "aho-corasick"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "android_glue"
 version = "0.0.2"
 
@@ -112,7 +120,7 @@ dependencies = [
 [[package]]
 name = "clipboard"
 version = "0.0.1"
-source = "git+https://github.com/aweinstock314/rust-clipboard#8ebdac0795f23119c28db9d11624059adf6482b5"
+source = "git+https://github.com/aweinstock314/rust-clipboard#61e33fb0337da4d09932f448f36bbc329ad96baa"
 dependencies = [
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -316,7 +324,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "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)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -423,7 +431,7 @@ dependencies = [
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -476,7 +484,7 @@ dependencies = [
 [[package]]
 name = "glutin"
 version = "0.0.26"
-source = "git+https://github.com/servo/glutin?branch=servo#abb5ba69eb6188d24567b47e7b5a289adc595f29"
+source = "git+https://github.com/servo/glutin?branch=servo#4cf15370a18d6327d159fb4f9950061bf1b715f6"
 dependencies = [
  "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -539,7 +547,7 @@ dependencies = [
 
 [[package]]
 name = "html5ever"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "html5ever_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -547,7 +555,7 @@ dependencies = [
  "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -588,7 +596,7 @@ dependencies = [
 [[package]]
 name = "io-surface"
 version = "0.1.0"
-source = "git+https://github.com/servo/io-surface-rs#401cf1d0a90290aa832b622061257d2ce985f69b"
+source = "git+https://github.com/servo/io-surface-rs#f772aa79f487d1722ec6ad3d3c3a8da649545c20"
 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)",
@@ -600,7 +608,7 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#32b64a91f58a9c99f56c48da9bb31d7e4e3860fc"
+source = "git+https://github.com/servo/rust-mozjs#fdcb73fbc9c5b7f78265f8ffd5fdbe329ec13b6b"
 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)",
@@ -670,7 +678,7 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -736,6 +744,14 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
+name = "memchr"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "mime"
 version = "0.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -788,8 +804,8 @@ dependencies = [
  "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)",
- "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex_macros 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -938,7 +954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "plugins"
 version = "0.0.1"
 dependencies = [
- "tenacious 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tenacious 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -971,7 +987,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)",
  "profile_traits 0.0.1",
- "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "task_info 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -1000,9 +1016,11 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.1.33"
+version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "aho-corasick 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1013,10 +1031,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex_macros"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1037,7 +1055,7 @@ dependencies = [
  "euclid 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
- "html5ever 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever 0.1.1 (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)",
@@ -1053,7 +1071,7 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1088,7 +1106,7 @@ dependencies = [
 [[package]]
 name = "selectors"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-selectors#bb6b97f38c3684e475e762ca0363b58fa6984c62"
+source = "git+https://github.com/servo/rust-selectors#9c920bfff7e55dd67e8af45943270bcd71fd46c9"
 dependencies = [
  "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1096,7 +1114,7 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1133,7 +1151,7 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1141,7 +1159,7 @@ dependencies = [
  "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1151,12 +1169,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "string_cache_shared"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1176,7 +1194,7 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (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",
@@ -1189,7 +1207,7 @@ dependencies = [
  "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1213,7 +1231,7 @@ dependencies = [
 
 [[package]]
 name = "tenacious"
-version = "0.0.4"
+version = "0.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1278,7 +1296,7 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1310,7 +1328,7 @@ source = "git+https://github.com/jgraham/webdriver-rust.git#b9cf2b1f65d4f01f593d
 dependencies = [
  "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)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/components/style/lib.rs b/components/style/lib.rs
index 4867bac20c0..bd84d33884a 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -2,13 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![feature(alloc)]
-#![feature(plugin)]
+#![feature(arc_unique)]
 #![feature(box_syntax)]
-#![feature(core)]
-#![feature(collections)]
-#![feature(hash)]
-#![feature(custom_attribute, custom_derive)]
+#![feature(core_intrinsics)]
+#![feature(custom_attribute)]
+#![feature(custom_derive)]
+#![feature(hasher_write)]
+#![feature(plugin)]
+#![feature(vec_push_all)]
+#![feature(vec_push_all)]
+
 #![plugin(string_cache_plugin)]
 #![plugin(plugins)]
 
diff --git a/components/util/lib.rs b/components/util/lib.rs
index 77273a35d07..8213c4e56c4 100644
--- a/components/util/lib.rs
+++ b/components/util/lib.rs
@@ -4,16 +4,20 @@
 
 #![feature(alloc)]
 #![feature(box_syntax)]
-#![feature(collections)]
-#![feature(core)]
+#![feature(core_intrinsics)]
 #![feature(exit_status)]
+#![feature(fnbox)]
+#![feature(hashmap_hasher)]
+#![feature(heap_api)]
+#![feature(oom)]
 #![feature(optin_builtin_traits)]
 #![feature(path_ext)]
 #![feature(plugin)]
 #![feature(rustc_private)]
+#![feature(slice_extras)]
 #![feature(step_by)]
 #![feature(step_trait)]
-#![feature(std_misc)]
+#![feature(thunk)]
 #![feature(zero_one)]
 
 #![plugin(string_cache_plugin)]
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 1e05f384c37..d595200ba6c 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -34,6 +34,14 @@ dependencies = [
 ]
 
 [[package]]
+name = "aho-corasick"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "android_glue"
 version = "0.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -111,7 +119,7 @@ dependencies = [
 [[package]]
 name = "clipboard"
 version = "0.0.1"
-source = "git+https://github.com/aweinstock314/rust-clipboard#8ebdac0795f23119c28db9d11624059adf6482b5"
+source = "git+https://github.com/aweinstock314/rust-clipboard#61e33fb0337da4d09932f448f36bbc329ad96baa"
 dependencies = [
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -315,7 +323,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "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)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -422,7 +430,7 @@ dependencies = [
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -468,7 +476,7 @@ dependencies = [
 [[package]]
 name = "glutin"
 version = "0.0.26"
-source = "git+https://github.com/servo/glutin?branch=servo#abb5ba69eb6188d24567b47e7b5a289adc595f29"
+source = "git+https://github.com/servo/glutin?branch=servo#4cf15370a18d6327d159fb4f9950061bf1b715f6"
 dependencies = [
  "android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -531,7 +539,7 @@ dependencies = [
 
 [[package]]
 name = "html5ever"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "html5ever_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -539,7 +547,7 @@ dependencies = [
  "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -580,7 +588,7 @@ dependencies = [
 [[package]]
 name = "io-surface"
 version = "0.1.0"
-source = "git+https://github.com/servo/io-surface-rs#401cf1d0a90290aa832b622061257d2ce985f69b"
+source = "git+https://github.com/servo/io-surface-rs#f772aa79f487d1722ec6ad3d3c3a8da649545c20"
 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)",
@@ -592,7 +600,7 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#32b64a91f58a9c99f56c48da9bb31d7e4e3860fc"
+source = "git+https://github.com/servo/rust-mozjs#fdcb73fbc9c5b7f78265f8ffd5fdbe329ec13b6b"
 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)",
@@ -662,7 +670,7 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -728,6 +736,14 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
+name = "memchr"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "mime"
 version = "0.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -780,8 +796,8 @@ dependencies = [
  "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)",
- "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex_macros 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -918,7 +934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "plugins"
 version = "0.0.1"
 dependencies = [
- "tenacious 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tenacious 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -951,7 +967,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)",
  "profile_traits 0.0.1",
- "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "task_info 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -980,9 +996,11 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.1.33"
+version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "aho-corasick 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -993,10 +1011,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex_macros"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1017,7 +1035,7 @@ dependencies = [
  "euclid 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
- "html5ever 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever 0.1.1 (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)",
@@ -1033,7 +1051,7 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1060,7 +1078,7 @@ dependencies = [
 [[package]]
 name = "selectors"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-selectors#bb6b97f38c3684e475e762ca0363b58fa6984c62"
+source = "git+https://github.com/servo/rust-selectors#9c920bfff7e55dd67e8af45943270bcd71fd46c9"
 dependencies = [
  "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1068,7 +1086,7 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1131,7 +1149,7 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1139,7 +1157,7 @@ dependencies = [
  "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1149,12 +1167,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "string_cache_shared"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1174,7 +1192,7 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (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 +1215,7 @@ dependencies = [
 
 [[package]]
 name = "tenacious"
-version = "0.0.4"
+version = "0.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1262,7 +1280,7 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1284,7 +1302,7 @@ source = "git+https://github.com/jgraham/webdriver-rust.git#b9cf2b1f65d4f01f593d
 dependencies = [
  "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)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs
index e926f8ebc14..377a91416ef 100644
--- a/ports/cef/lib.rs
+++ b/ports/cef/lib.rs
@@ -2,18 +2,21 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![feature(alloc)]
+#![feature(borrow_state)]
+#![feature(box_raw)]
 #![feature(box_syntax)]
-#![feature(plugin)]
-#![feature(link_args)]
-#![feature(thread_local)]
-#![feature(core)]
 #![feature(convert)]
-#![feature(std_misc)]
-#![feature(collections)]
+#![feature(core_intrinsics)]
+#![feature(filling_drop)]
+#![feature(iter_arith)]
+#![feature(link_args)]
 #![feature(negate_unsigned)]
+#![feature(plugin)]
+#![feature(str_utf16)]
+#![feature(thread_local)]
 #![feature(unicode)]
-#![feature(unsafe_no_drop_flag, filling_drop)]
+#![feature(unsafe_no_drop_flag)]
+
 #![allow(non_camel_case_types)]
 
 #![plugin(plugins)]
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 6d248ea394a..daa7e331dc3 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -26,6 +26,14 @@ dependencies = [
 ]
 
 [[package]]
+name = "aho-corasick"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "azure"
 version = "0.1.0"
 source = "git+https://github.com/servo/rust-azure#d4ae702d7525a560d15e08238c7b7b75c093209d"
@@ -98,7 +106,7 @@ dependencies = [
 [[package]]
 name = "clipboard"
 version = "0.0.1"
-source = "git+https://github.com/aweinstock314/rust-clipboard#8ebdac0795f23119c28db9d11624059adf6482b5"
+source = "git+https://github.com/aweinstock314/rust-clipboard#61e33fb0337da4d09932f448f36bbc329ad96baa"
 dependencies = [
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -292,7 +300,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "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)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -401,7 +409,7 @@ dependencies = [
  "skia 0.0.20130412 (git+https://github.com/servo/skia)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -465,7 +473,7 @@ dependencies = [
 
 [[package]]
 name = "html5ever"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "html5ever_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -473,7 +481,7 @@ dependencies = [
  "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -514,7 +522,7 @@ dependencies = [
 [[package]]
 name = "io-surface"
 version = "0.1.0"
-source = "git+https://github.com/servo/io-surface-rs#401cf1d0a90290aa832b622061257d2ce985f69b"
+source = "git+https://github.com/servo/io-surface-rs#f772aa79f487d1722ec6ad3d3c3a8da649545c20"
 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)",
@@ -526,7 +534,7 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#32b64a91f58a9c99f56c48da9bb31d7e4e3860fc"
+source = "git+https://github.com/servo/rust-mozjs#fdcb73fbc9c5b7f78265f8ffd5fdbe329ec13b6b"
 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)",
@@ -596,7 +604,7 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -654,6 +662,14 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
+name = "memchr"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "mime"
 version = "0.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -706,8 +722,8 @@ dependencies = [
  "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)",
- "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex_macros 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -826,7 +842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "plugins"
 version = "0.0.1"
 dependencies = [
- "tenacious 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tenacious 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -859,7 +875,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)",
  "profile_traits 0.0.1",
- "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "task_info 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -888,9 +904,11 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.1.33"
+version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "aho-corasick 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -901,10 +919,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex_macros"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "regex 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -925,7 +943,7 @@ dependencies = [
  "euclid 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
- "html5ever 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever 0.1.1 (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)",
@@ -941,7 +959,7 @@ dependencies = [
  "script_traits 0.0.1",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -968,7 +986,7 @@ dependencies = [
 [[package]]
 name = "selectors"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-selectors#bb6b97f38c3684e475e762ca0363b58fa6984c62"
+source = "git+https://github.com/servo/rust-selectors#9c920bfff7e55dd67e8af45943270bcd71fd46c9"
 dependencies = [
  "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -976,7 +994,7 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1029,7 +1047,7 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1037,7 +1055,7 @@ dependencies = [
  "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1047,12 +1065,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "string_cache_shared"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1072,7 +1090,7 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (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",
@@ -1095,7 +1113,7 @@ dependencies = [
 
 [[package]]
 name = "tenacious"
-version = "0.0.4"
+version = "0.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1151,7 +1169,7 @@ dependencies = [
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1173,7 +1191,7 @@ source = "git+https://github.com/jgraham/webdriver-rust.git#b9cf2b1f65d4f01f593d
 dependencies = [
  "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)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/rust-snapshot-hash b/rust-snapshot-hash
index 8d19a5fb07c..f36d0d184aa 100644
--- a/rust-snapshot-hash
+++ b/rust-snapshot-hash
@@ -1 +1 @@
-6e7fcc44aef7b457f3be3a1971d9f026957678d5/rustc-1.2.0-dev
+2d0cbf3e3e25e092bd9e4c94d08e446b680869f0/rustc-1.2.0-dev
diff --git a/tests/reftest.rs b/tests/reftest.rs
index 9aaf8e68caf..ae22841a921 100644
--- a/tests/reftest.rs
+++ b/tests/reftest.rs
@@ -7,7 +7,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(collections, exit_status, fs_walk, path_ext, slice_patterns, test)]
+#![feature(append)]
+#![feature(exit_status)]
+#![feature(fs_walk)]
+#![feature(path_ext)]
+#![feature(slice_extras)]
+#![feature(slice_patterns)]
+#![feature(test)]
+
 #[macro_use] extern crate bitflags;
 extern crate png;
 extern crate test;
diff --git a/tests/unit/net/lib.rs b/tests/unit/net/lib.rs
index 29d04d2ee65..f9c11c958a3 100644
--- a/tests/unit/net/lib.rs
+++ b/tests/unit/net/lib.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![cfg_attr(test, feature(alloc))]
+#![cfg_attr(test, feature(box_raw))]
 
 extern crate net;
 extern crate net_traits;
diff --git a/tests/unit/util/lib.rs b/tests/unit/util/lib.rs
index 198858b8d4e..ab972bf7017 100644
--- a/tests/unit/util/lib.rs
+++ b/tests/unit/util/lib.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![feature(plugin, custom_derive, alloc)]
+#![feature(plugin, custom_derive, heap_api)]
 #![plugin(plugins)]
 extern crate util;
 extern crate libc;