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

Auto merge of #6155 - servo:rustup_2015-05-21, r=Manishearth

Browse source 
r? @Manishearth 

(there's just the one plugins-related change required)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6155)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-21 10:50:53 -05:00
commit a0fccea670
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/plugins/jstraceable.rs
View file

@ -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)
}
],

2
rust-snapshot-hash
View file

@ -1 +1 @@
716f920b7e234b450f272346fea961832505c06e/rustc-1.1.0-dev
b301e02f37127da993dd2cf370aa1066d48b042e/rustc-1.2.0-dev