servo: Merge #6459 - Update to rustc 2d0cbf3e3e25e092bd9e4c94d08e446b…

…680869f0 (from servo:rustup_20150625); r=SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: 21b48fc44d0b32627918b4778fed16203eecdba5

servo/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;

servo/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;

servo/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;

servo/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)]
 

servo/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)]
 

servo/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)]
 

servo/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)]
 

servo/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;

servo/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())
                                         ));
                         }
                     }

servo/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));
                 }
             }
             _ => {}

servo/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;
 

servo/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)]