diff options
author | Ms2ger <Ms2ger@gmail.com> | 2015-12-30 16:05:10 +0100 |
---|---|---|
committer | Lars Bergstrom <lars@lars.com> | 2016-01-14 14:56:18 -0600 |
commit | 74f6c9b74fcc8839ac9c0ce610b41ae948d2d771 (patch) | |
tree | ca170f36519629ffb96eefadebc8d38f35036662 | |
parent | a28b5cb43859b6300c0b157c6b3d25d78606dda8 (diff) | |
download | servo-74f6c9b74fcc8839ac9c0ce610b41ae948d2d771.tar.gz servo-74f6c9b74fcc8839ac9c0ce610b41ae948d2d771.zip |
Update to rustc 1.7.0-nightly (b4707ebca 2015-12-27)
-rw-r--r-- | components/layout/context.rs | 3 | ||||
-rw-r--r-- | components/layout/layout_debug.rs | 3 | ||||
-rw-r--r-- | components/layout/traversal.rs | 3 | ||||
-rw-r--r-- | components/plugins/heap_size.rs | 2 | ||||
-rw-r--r-- | components/plugins/jstraceable.rs | 4 | ||||
-rw-r--r-- | components/plugins/lib.rs | 1 | ||||
-rw-r--r-- | components/servo/Cargo.lock | 12 | ||||
-rw-r--r-- | ports/cef/Cargo.lock | 12 | ||||
-rw-r--r-- | ports/gonk/Cargo.lock | 12 | ||||
-rw-r--r-- | rust-nightly-date | 2 |
10 files changed, 31 insertions, 23 deletions
diff --git a/components/layout/context.rs b/components/layout/context.rs index 7c245408a23..766e56d5dce 100644 --- a/components/layout/context.rs +++ b/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; diff --git a/components/layout/layout_debug.rs b/components/layout/layout_debug.rs index dc1ac1db946..90b5870e468 100644 --- a/components/layout/layout_debug.rs +++ b/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; diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 32233c13ee6..b5f7505d834 100644 --- a/components/layout/traversal.rs +++ b/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}; diff --git a/components/plugins/heap_size.rs b/components/plugins/heap_size.rs index c2dc2d2566c..0f8ea67fa62 100644 --- a/components/plugins/heap_size.rs +++ b/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)) { diff --git a/components/plugins/jstraceable.rs b/components/plugins/jstraceable.rs index d1166c6d324..3754be89fc8 100644 --- a/components/plugins/jstraceable.rs +++ b/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 { diff --git a/components/plugins/lib.rs b/components/plugins/lib.rs index 8528ee06d57..b1d701e6aec 100644 --- a/components/plugins/lib.rs +++ b/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; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 21f7d4543d3..511e7f633ca 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -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)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 4c7f5597d10..9b192906390 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -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)", ] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 10d93765d0e..65a246abad5 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -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)", ] diff --git a/rust-nightly-date b/rust-nightly-date index cbe5e22405f..b8153ce8e0b 100644 --- a/rust-nightly-date +++ b/rust-nightly-date @@ -1 +1 @@ -2015-12-09 +2015-12-27 |