Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Ms2ger 2015-12-30 16:05:10 +01:00 • committed by Lars Bergstrom
parent a28b5cb438
commit 74f6c9b74f
10 changed files with 31 additions and 23 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. //! Data needed by the layout thread.
#![deny(unsafe_code)] // for thread_local
#![allow(unsafe_code)]
use app_units::Au; use app_units::Au;
use canvas_traits::CanvasMsg; 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 //! Supports writing a trace file created during each layout scope
//! that can be viewed by an external tool to make layout debugging easier. //! that can be viewed by an external tool to make layout debugging easier.
// for thread_local
#![allow(unsafe_code)]
use flow; use flow;
use flow_ref::FlowRef; use flow_ref::FlowRef;
use rustc_serialize::json; 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. //! Traversals over the DOM and flow trees, running the layout computations.
// For thread_local.
#![allow(unsafe_code)]
use construct::FlowConstructor; use construct::FlowConstructor;
use context::{LayoutContext, SharedLayoutContext}; use context::{LayoutContext, SharedLayoutContext};
use flow::{PostorderFlowTraversal, PreorderFlowTraversal}; 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::codemap::Span;
use syntax::ext::base::{Annotatable, ExtCtxt}; use syntax::ext::base::{Annotatable, ExtCtxt};
use syntax::ext::build::AstBuilder; use syntax::ext::build::AstBuilder;
use syntax::ext::deriving::generic::*;
use syntax::ptr::P; use syntax::ptr::P;
use syntax_ext::deriving::generic::*;
pub fn expand_heap_size(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, pub fn expand_heap_size(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem,
item: &Annotatable, push: &mut FnMut(Annotatable)) { 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::codemap::Span;
use syntax::ext::base::{Annotatable, ExtCtxt}; use syntax::ext::base::{Annotatable, ExtCtxt};
use syntax::ext::build::AstBuilder; 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::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 { pub fn expand_dom_struct(cx: &mut ExtCtxt, sp: Span, _: &MetaItem, anno: Annotatable) -> Annotatable {
if let Annotatable::Item(item) = anno { 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; extern crate rustc_plugin;
#[macro_use] #[macro_use]
extern crate syntax; extern crate syntax;
extern crate syntax_ext;
extern crate tenacious; extern crate tenacious;
extern crate url; extern crate url;

12
components/servo/Cargo.lock generated
View file

@ -85,7 +85,7 @@ dependencies = [
[[package]] [[package]]
name = "aster" name = "aster"
version = "0.9.1" version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -99,7 +99,7 @@ dependencies = [
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "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 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)", "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 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)", "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" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -780,7 +780,7 @@ dependencies = [
[[package]] [[package]]
name = "heapsize_plugin" name = "heapsize_plugin"
version = "0.1.1" version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1420,7 +1420,7 @@ name = "quasi_codegen"
version = "0.3.10" version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
@ -1588,7 +1588,7 @@ name = "serde_codegen"
version = "0.6.6" version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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 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)", "quasi_macros 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

12
ports/cef/Cargo.lock generated
View file

@ -75,7 +75,7 @@ dependencies = [
[[package]] [[package]]
name = "aster" name = "aster"
version = "0.9.1" version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -89,7 +89,7 @@ dependencies = [
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "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 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)", "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 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)", "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" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -739,7 +739,7 @@ dependencies = [
[[package]] [[package]]
name = "heapsize_plugin" name = "heapsize_plugin"
version = "0.1.1" version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1344,7 +1344,7 @@ name = "quasi_codegen"
version = "0.3.10" version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
@ -1503,7 +1503,7 @@ name = "serde_codegen"
version = "0.6.6" version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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 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)", "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]] [[package]]
name = "aster" name = "aster"
version = "0.9.1" version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -80,7 +80,7 @@ dependencies = [
"euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", "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 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)", "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 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)", "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" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -709,7 +709,7 @@ dependencies = [
[[package]] [[package]]
name = "heapsize_plugin" name = "heapsize_plugin"
version = "0.1.1" version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1314,7 +1314,7 @@ name = "quasi_codegen"
version = "0.3.10" version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
@ -1473,7 +1473,7 @@ name = "serde_codegen"
version = "0.6.6" version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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 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)", "quasi_macros 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
rust-nightly-date
View file

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