Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from Jan 15, 2016
Next

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

  • Loading branch information
Ms2ger authored and larsbergstrom committed Jan 14, 2016
commit 74f6c9b74fcc8839ac9c0ce610b41ae948d2d771
@@ -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;
@@ -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;
@@ -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};
@@ -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)) {
@@ -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 {
@@ -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;

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

@@ -1 +1 @@
2015-12-09
2015-12-27
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.