servo: Merge #12712 - Update Rust to 1.12.0-nightly (545a3a94f 2016-08-04) (from servo:rustup); r=Ms2ger
authorAnthony Ramine <n.oxyde@gmail.com>
Fri, 05 Aug 2016 07:46:27 -0500
changeset 339444 56ae03cea27ee511ee3004e5455661866f0787c3
parent 339443 10e1244add2ce7a1899898a4c6db52aa99440646
child 339445 c4aefdcee7d19bd49f40ac50619a78747ac91568
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
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
servo/components/plugins/lints/unrooted_must_root.rs
servo/components/profile/lib.rs
servo/components/range/lib.rs
servo/components/style/values/specified/mod.rs
servo/rust-nightly-date
--- a/servo/components/layout/table_cell.rs
+++ b/servo/components/layout/table_cell.rs
@@ -14,17 +14,16 @@ use display_list_builder::{BlockFlowDisp
 use euclid::{Point2D, Rect, SideOffsets2D, Size2D};
 use flow::{self, Flow, FlowClass, OpaqueFlow};
 use fragment::{Fragment, FragmentBorderBoxIterator, Overflow};
 use gfx::display_list::StackingContext;
 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;
 use style::computed_values::{border_collapse, border_top_style, vertical_align};
 use style::context::SharedStyleContext;
 use style::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode};
 use style::properties::ServoComputedValues;
 use table::InternalTable;
--- a/servo/components/plugins/lints/unrooted_must_root.rs
+++ b/servo/components/plugins/lints/unrooted_must_root.rs
@@ -206,17 +206,17 @@ impl<'a, 'b: 'a, 'tcx: 'a+'b> visit::Vis
                             &format!("Expression of type {:?} must be rooted", ty))
             }
         }
 
         visit::walk_pat(self, pat);
     }
 
     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);
         }
     }
 
     fn visit_foreign_item(&mut self, _: &'a hir::ForeignItem) {}
     fn visit_ty(&mut self, _: &'a hir::Ty) { }
 }
--- a/servo/components/profile/lib.rs
+++ b/servo/components/profile/lib.rs
@@ -1,15 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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(not(target_os = "windows"), feature(alloc_jemalloc))]
 #![feature(box_syntax)]
-#![feature(iter_arith)]
 #![feature(plugin)]
 #![plugin(plugins)]
 #![feature(custom_derive)]
 #![plugin(serde_macros)]
 
 #![deny(unsafe_code)]
 
 #[allow(unused_extern_crates)]
--- a/servo/components/range/lib.rs
+++ b/servo/components/range/lib.rs
@@ -1,32 +1,30 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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(custom_derive)]
 #![feature(plugin)]
 #![feature(step_trait)]
-#![feature(zero_one)]
 
 #![plugin(heapsize_plugin)]
 #![plugin(serde_macros)]
 
 #![deny(unsafe_code)]
 
 extern crate heapsize;
 extern crate num_traits;
 extern crate rustc_serialize;
 extern crate serde;
 
 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:
     Copy
     + ops::Add<Self, Output=Self>
     + ops::Sub<Self, Output=Self>
     + cmp::Ord
 {
@@ -168,17 +166,17 @@ pub struct EachIndex<T, I> {
     phantom: PhantomData<I>,
 }
 
 pub fn each_index<T: Int, I: RangeIndex<Index=T>>(start: I, stop: I) -> EachIndex<T, I> {
     EachIndex { it: start.get()..stop.get(), phantom: PhantomData }
 }
 
 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]
     fn next(&mut self) -> Option<I> {
         self.it.next().map(RangeIndex::new)
     }
 
     #[inline]
--- a/servo/components/style/values/specified/mod.rs
+++ b/servo/components/style/values/specified/mod.rs
@@ -2,17 +2,19 @@
  * 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/. */
 
 use app_units::Au;
 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;
 use std::fmt;
 use std::ops::Mul;
 use style_traits::values::specified::AllowedNumericType;
 use super::computed::{Context, ToComputedValue};
 use super::{CSSFloat, FONT_MEDIUM_PX, HasViewportPercentage, LocalToCss, NoViewportPercentage};
--- a/servo/rust-nightly-date
+++ b/servo/rust-nightly-date
@@ -1,1 +1,1 @@
-2016-07-25
+2016-08-05