servo: Merge #12712 - Update Rust to 1.12.0-nightly (545a3a94f 2016-08-04) (from servo:rustup); r=Ms2ger

Source-Repo: https://github.com/servo/servo
Source-Revision: 414204c909e316ca0775881eb3a65875bf81500f

servo/components/layout/table_cell.rs

@@ -19,7 +19,6 @@ use gfx_traits::StackingContextId;
 use gfx_traits::print_tree::PrintTree;
 use layout_debug;
 use model::MaybeAuto;
-use script_layout_interface::restyle_damage::REFLOW;
 use script_layout_interface::wrapper_traits::ThreadSafeLayoutNode;
 use std::fmt;
 use std::sync::Arc;

servo/components/plugins/lints/unrooted_must_root.rs

@@ -211,9 +211,9 @@ impl<'a, 'b: 'a, 'tcx: 'a+'b> visit::Visitor<'a> for FnDefVisitor<'a, 'b, 'tcx>
     }
 
     fn visit_fn(&mut self, kind: visit::FnKind<'a>, decl: &'a hir::FnDecl,
-                block: &'a hir::Block, span: codemap::Span, _id: ast::NodeId) {
+                block: &'a hir::Block, span: codemap::Span, id: ast::NodeId) {
         if let visit::FnKind::Closure(_) = kind {
-            visit::walk_fn(self, kind, decl, block, span);
+            visit::walk_fn(self, kind, decl, block, span, id);
         }
     }
 

servo/components/profile/lib.rs

@@ -4,7 +4,6 @@
 
 #![cfg_attr(not(target_os = "windows"), feature(alloc_jemalloc))]
 #![feature(box_syntax)]
-#![feature(iter_arith)]
 #![feature(plugin)]
 #![plugin(plugins)]
 #![feature(custom_derive)]

servo/components/range/lib.rs

@@ -5,7 +5,6 @@
 #![feature(custom_derive)]
 #![feature(plugin)]
 #![feature(step_trait)]
-#![feature(zero_one)]
 
 #![plugin(heapsize_plugin)]
 #![plugin(serde_macros)]
@@ -21,7 +20,6 @@ use std::cmp::{self, max, min};
 use std::fmt;
 use std::iter;
 use std::marker::PhantomData;
-use std::num;
 use std::ops;
 
 pub trait Int:
@@ -173,7 +171,7 @@ pub fn each_index<T: Int, I: RangeIndex<Index=T>>(start: I, stop: I) -> EachInde
 }
 
 impl<T: Int, I: RangeIndex<Index=T>> Iterator for EachIndex<T, I>
-where T: Int + num::One + iter::Step, for<'a> &'a T: ops::Add<&'a T, Output = T> {
+where T: Int + iter::Step, for<'a> &'a T: ops::Add<&'a T, Output = T> {
     type Item = I;
 
     #[inline]

servo/components/style/values/specified/mod.rs

@@ -7,7 +7,9 @@ use cssparser::{self, Parser, ToCss, Token};
 use euclid::size::Size2D;
 #[cfg(feature = "gecko")]
 use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI};
-use parser::{ParserContext, ParserContextExtraData};
+use parser::ParserContext;
+#[cfg(feature = "gecko")]
+use parser::ParserContextExtraData;
 use std::ascii::AsciiExt;
 use std::cmp;
 use std::f32::consts::PI;

servo/rust-nightly-date

@@ -1 +1 @@
-2016-07-25
+2016-08-05