aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-08-05 07:46:27 -0500
committerGitHub <noreply@github.com>2016-08-05 07:46:27 -0500
commit414204c909e316ca0775881eb3a65875bf81500f (patch)
tree745538e5b840ea5a3f5b5056b1e459f06aa09349
parent0fc0db67c64bf8ab4593d1f84b8d1be517fa1b74 (diff)
parentf88302ebf3844662a36793ba352d0e5414e246c6 (diff)
downloadservo-414204c909e316ca0775881eb3a65875bf81500f.tar.gz
servo-414204c909e316ca0775881eb3a65875bf81500f.zip
Auto merge of #12712 - servo:rustup, r=Ms2ger
Update Rust to 1.12.0-nightly (545a3a94f 2016-08-04) <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12712) <!-- Reviewable:end -->
-rw-r--r--components/layout/table_cell.rs1
-rw-r--r--components/plugins/lints/unrooted_must_root.rs4
-rw-r--r--components/profile/lib.rs1
-rw-r--r--components/range/lib.rs4
-rw-r--r--components/style/values/specified/mod.rs4
-rw-r--r--rust-nightly-date2
6 files changed, 7 insertions, 9 deletions
diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs
index f012121f5ae..a7778738d29 100644
--- a/components/layout/table_cell.rs
+++ b/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;
diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs
index 6e6b6f516c2..fe4b44d0718 100644
--- a/components/plugins/lints/unrooted_must_root.rs
+++ b/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);
}
}
diff --git a/components/profile/lib.rs b/components/profile/lib.rs
index c9326d93cac..61682764de4 100644
--- a/components/profile/lib.rs
+++ b/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)]
diff --git a/components/range/lib.rs b/components/range/lib.rs
index d32909c0808..467797556a8 100644
--- a/components/range/lib.rs
+++ b/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]
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
index 5dd8bcc0bd4..d27b0d6f893 100644
--- a/components/style/values/specified/mod.rs
+++ b/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;
diff --git a/rust-nightly-date b/rust-nightly-date
index 03237ba6f69..9fd465ab723 100644
--- a/rust-nightly-date
+++ b/rust-nightly-date
@@ -1 +1 @@
-2016-07-25
+2016-08-05