Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #6155 - Rustup to 1.2.0 (from servo:rustup_2015-05-21); r=Manishearth

Browse Source 
r? @Manishearth

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

Source-Repo: https://github.com/servo/servo
Source-Revision: a0fccea670124d5ccfef1c13fe1b5d2e58891236
This commit is contained in:
Lars Bergstrom 2015-05-21 10:50:53 -05:00
parent e75d4a7ceb
commit 0be1747830
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
servo/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
servo/rust-snapshot-hash
View File

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