Update to rustc 1.7.0-nightly (b4707ebca 2015-12-27)

components/layout/context.rs

@@ -4,7 +4,8 @@
 
 //! Data needed by the layout thread.
 
-#![deny(unsafe_code)]
+// for thread_local
+#![allow(unsafe_code)]
 
 use app_units::Au;
 use canvas_traits::CanvasMsg;

components/layout/layout_debug.rs

@@ -5,6 +5,9 @@
 //! Supports writing a trace file created during each layout scope
 //! that can be viewed by an external tool to make layout debugging easier.
 
+// for thread_local
+#![allow(unsafe_code)]
+
 use flow;
 use flow_ref::FlowRef;
 use rustc_serialize::json;

components/layout/traversal.rs

@@ -4,6 +4,9 @@
 
 //! Traversals over the DOM and flow trees, running the layout computations.
 
+// For thread_local.
+#![allow(unsafe_code)]
+
 use construct::FlowConstructor;
 use context::{LayoutContext, SharedLayoutContext};
 use flow::{PostorderFlowTraversal, PreorderFlowTraversal};

components/plugins/heap_size.rs

@@ -18,8 +18,8 @@ use syntax::attr::AttrMetaMethods;
 use syntax::codemap::Span;
 use syntax::ext::base::{Annotatable, ExtCtxt};
 use syntax::ext::build::AstBuilder;
-use syntax::ext::deriving::generic::*;
 use syntax::ptr::P;
+use syntax_ext::deriving::generic::*;
 
 pub fn expand_heap_size(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem,
                         item: &Annotatable, push: &mut FnMut(Annotatable)) {

components/plugins/jstraceable.rs

@@ -7,9 +7,9 @@ use syntax::ast::{MetaItem, Expr};
 use syntax::codemap::Span;
 use syntax::ext::base::{Annotatable, ExtCtxt};
 use syntax::ext::build::AstBuilder;
-use syntax::ext::deriving::generic::{Struct, Substructure, TraitDef, ty};
-use syntax::ext::deriving::generic::{combine_substructure, EnumMatching, FieldInfo, MethodDef};
 use syntax::ptr::P;
+use syntax_ext::deriving::generic::{Struct, Substructure, TraitDef, ty};
+use syntax_ext::deriving::generic::{combine_substructure, EnumMatching, FieldInfo, MethodDef};
 
 pub fn expand_dom_struct(cx: &mut ExtCtxt, sp: Span, _: &MetaItem, anno: Annotatable) -> Annotatable {
     if let Annotatable::Item(item) = anno {

components/plugins/lib.rs

@@ -23,6 +23,7 @@ extern crate rustc_front;
 extern crate rustc_plugin;
 #[macro_use]
 extern crate syntax;
+extern crate syntax_ext;
 extern crate tenacious;
 
 extern crate url;

components/servo/lib.rs

@@ -252,3 +252,12 @@ pub fn run_content_process(token: String) {
                                      script::script_thread::ScriptThread>(true);
 }
 
+// This is a workaround for https://github.com/rust-lang/rust/pull/30175 until
+// https://github.com/lfairy/rust-errno/pull/5 lands, and should be removed once
+// we update Servo with the rust-errno crate.
+#[cfg(target_os = "android")]
+#[no_mangle]
+pub unsafe extern fn __errno_location() -> *mut i32 {
+    extern { fn __errno() -> *mut i32; }
+    __errno()
+}

components/style/lib.rs

@@ -14,8 +14,6 @@
 #![plugin(serde_macros)]
 #![plugin(plugins)]
 
-#![deny(unsafe_code)]
-
 extern crate app_units;
 #[macro_use]
 extern crate bitflags;

ports/gonk/fake-ld.sh

@@ -5,5 +5,4 @@ if echo $@ | grep -qv " -shared"
 then
     PIE_FLAG="-pie"
 fi
-$PIE_FLAG
 arm-linux-androideabi-g++ $@ $LDFLAGS $PIE_FLAG -lGLESv2 -L$GONKDIR/backup-flame/system/lib/

python/servo/command_base.py

@@ -11,7 +11,6 @@
 from os import path
 import contextlib
 import subprocess
-from subprocess import PIPE
 import sys
 import toml
 
@@ -101,7 +100,6 @@ def resolverelative(category, key):
         if not self.config["tools"]["system-cargo"]:
             self.config["tools"]["cargo-root"] = path.join(
                 context.sharedir, "cargo", self.cargo_build_id())
-        self.config["tools"].setdefault("rustc-with-gold", True)
 
         self.config.setdefault("build", {})
         self.config["build"].setdefault("android", False)
@@ -316,10 +314,6 @@ def build_env(self, gonk=False, hosts_file_path=None):
 
         env['RUSTDOC'] = path.join(self.context.topdir, 'etc', 'rustdoc-with-private')
 
-        if self.config["tools"]["rustc-with-gold"]:
-            if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0:
-                env['RUSTC'] = path.join(self.context.topdir, 'etc', 'rustc-with-gold')
-
         return env
 
     def servo_crate(self):

rust-nightly-date

@@ -1 +1 @@
-2015-12-09
+2015-12-27