From 3d30dfc652cf09c6a406ec3fe7bcb54ce14e21f5 Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Thu, 21 May 2015 10:13:27 -0500 Subject: [PATCH 1/2] Upgrade to a 1.2.0 rust compiler --- rust-snapshot-hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-snapshot-hash b/rust-snapshot-hash index 4a2a4452cf6..eb07c90a5fd 100644 --- a/rust-snapshot-hash +++ b/rust-snapshot-hash @@ -1 +1 @@ -716f920b7e234b450f272346fea961832505c06e/rustc-1.1.0-dev +b301e02f37127da993dd2cf370aa1066d48b042e/rustc-1.2.0-dev From fd4afc93a838bd4535300ef3e321e3a9281d0d36 Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Thu, 21 May 2015 10:13:48 -0500 Subject: [PATCH 2/2] Update plugins API --- components/plugins/jstraceable.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/components/plugins/jstraceable.rs b/components/plugins/jstraceable.rs index 7f4757816e0..4c23a1897a5 100644 --- a/components/plugins/jstraceable.rs +++ b/components/plugins/jstraceable.rs @@ -42,6 +42,7 @@ pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item: args: vec!(ty::Ptr(box ty::Literal(ty::Path::new(vec!("js","jsapi","JSTracer"))), ty::Raw(ast::MutMutable))), ret_ty: ty::nil_ty(), attributes: vec![quote_attr!(cx, #[inline(always)])], + is_unsafe: false, combine_substructure: combine_substructure(box jstraceable_substructure) } ],