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

r? @Manishearth

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

Source-Repo: https://github.com/servo/servo
Source-Revision: a0fccea670124d5ccfef1c13fe1b5d2e58891236

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

servo/rust-snapshot-hash

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