servo: Merge #6243 - Upgrade to rustc 1.2.0-dev (474c6e0ae 2015-05-30) (from servo:rustup_20150601); r=nox

cc nox

r? Ms2ger kmcallister larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 83a0b7822181b26862f26fd0cd1da02da7ea6210

UltraBlame original commit: 87d72783e44ba474502e5df10fb36c4dca3706b7

Author: marco-c

servo/components/plugins/jstraceable.rs

@@ -34,7 +34,7 @@ pub fn expand_dom_struct(cx: &mut ExtCtxt, sp: Span, _: &MetaItem, anno: Annotat
 
 
 
-pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item: Annotatable,
+pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item: &Annotatable,
                           push: &mut FnMut(Annotatable)) {
     let trait_def = TraitDef {
         span: span,
@@ -57,7 +57,7 @@ pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item:
         ],
         associated_types: vec![],
     };
-    trait_def.expand(cx, mitem, &item, push)
+    trait_def.expand(cx, mitem, item, push)
 }
 
 

servo/components/plugins/lints/unrooted_must_root.rs

@@ -91,11 +91,11 @@ impl LintPass for UnrootedPass {
     fn check_fn(&mut self, cx: &Context, kind: visit::FnKind, decl: &ast::FnDecl,
                 block: &ast::Block, _span: codemap::Span, id: ast::NodeId) {
         match kind {
-            visit::FkItemFn(i, _, _, _, _) |
+            visit::FkItemFn(i, _, _, _, _, _) |
             visit::FkMethod(i, _, _) if i.as_str() == "new" || i.as_str() == "new_inherited" => {
                 return;
             },
-            visit::FkItemFn(_, _, style, _, _) => match style {
+            visit::FkItemFn(_, _, style, _, _, _) => match style {
                 ast::Unsafety::Unsafe => return,
                 _ => ()
             },

servo/components/plugins/reflector.rs

@@ -9,9 +9,9 @@ use syntax::ast;
 use utils::match_ty_unwrap;
 
 
-pub fn expand_reflector(cx: &mut ExtCtxt, span: Span, _: &MetaItem, annotatable: Annotatable,
+pub fn expand_reflector(cx: &mut ExtCtxt, span: Span, _: &MetaItem, annotatable: &Annotatable,
                         push: &mut FnMut(Annotatable)) {
-    if let Annotatable::Item(item) = annotatable {
+    if let &Annotatable::Item(ref item) = annotatable {
         if let ast::ItemStruct(ref def, _) = item.node {
             let struct_name = item.ident;
 

servo/components/plugins/utils.rs

@@ -76,7 +76,7 @@ pub fn unsafe_context(map: &ast_map::Map, id: ast::NodeId) -> bool {
         },
         Some(ast_map::NodeItem(itm)) => {
             match itm.node {
-                ast::ItemFn(_, style, _, _, _) => match style {
+                ast::ItemFn(_, style, _, _, _, _) => match style {
                     ast::Unsafety::Unsafe => true,
                     _ => false,
                 },