Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9093 - servo:rustup, r=KiChjang

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

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9093)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-15 19:37:07 +05:30
commit 4cb2c87982
16 changed files with 45 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/context.rs
View file

@ -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;

3
components/layout/layout_debug.rs
View file

@ -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;

3
components/layout/traversal.rs
View file

@ -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};

2
components/plugins/heap_size.rs
View file

@ -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)) {

4
components/plugins/jstraceable.rs
View file

@ -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 {

1
components/plugins/lib.rs
View file

@ -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;

12
components/servo/Cargo.lock generated
View file

@ -85,7 +85,7 @@ dependencies = [
[[package]]
name = "aster"
version = "0.9.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -99,7 +99,7 @@ dependencies = [
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -517,7 +517,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -780,7 +780,7 @@ dependencies = [
[[package]]
name = "heapsize_plugin"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -1420,7 +1420,7 @@ name = "quasi_codegen"
version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"aster 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1588,7 +1588,7 @@ name = "serde_codegen"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"aster 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
]

9
components/servo/lib.rs
View file

@ -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()
}

2
components/style/lib.rs
View file

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

2
etc/rustc-with-gold
View file

@ -1,2 +0,0 @@
#!/bin/sh
rustc -C link-args=-fuse-ld=gold "$@"

12
ports/cef/Cargo.lock generated
View file

@ -75,7 +75,7 @@ dependencies = [
[[package]]
name = "aster"
version = "0.9.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -89,7 +89,7 @@ dependencies = [
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -485,7 +485,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -739,7 +739,7 @@ dependencies = [
[[package]]
name = "heapsize_plugin"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -1344,7 +1344,7 @@ name = "quasi_codegen"
version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"aster 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1503,7 +1503,7 @@ name = "serde_codegen"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"aster 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
]

10
ports/geckolib/Cargo.lock generated
View file

@ -32,7 +32,7 @@ dependencies = [
[[package]]
name = "aster"
version = "0.9.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -138,7 +138,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -167,7 +167,7 @@ dependencies = [
[[package]]
name = "heapsize_plugin"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -268,7 +268,7 @@ name = "quasi_codegen"
version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"aster 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -330,7 +330,7 @@ name = "serde_codegen"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"aster 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
]

12
ports/gonk/Cargo.lock generated
View file

@ -66,7 +66,7 @@ dependencies = [
[[package]]
name = "aster"
version = "0.9.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -80,7 +80,7 @@ dependencies = [
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -475,7 +475,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -709,7 +709,7 @@ dependencies = [
[[package]]
name = "heapsize_plugin"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -1314,7 +1314,7 @@ name = "quasi_codegen"
version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"aster 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1473,7 +1473,7 @@ name = "serde_codegen"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"aster 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
]

1
ports/gonk/fake-ld.sh
View file

@ -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/

6
python/servo/command_base.py
View file

@ -11,7 +11,6 @@ import os
from os import path
import contextlib
import subprocess
from subprocess import PIPE
import sys
import toml
@ -101,7 +100,6 @@ class CommandBase(object):
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 @@ class CommandBase(object):
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):

2
rust-nightly-date
View file

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