Update Rust to 1.10.0-nightly (cd6a40017 2016-05-16)

zakorgy · May 26, 2016 · f64c3ea · f64c3ea
1 parent 742e3d8
commit f64c3ea
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 82 deletions.
diff --git a/components/plugins/jstraceable.rs b/components/plugins/jstraceable.rs
@@ -53,7 +53,8 @@ pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item:
                 ret_ty: ty::nil_ty(),
                 attributes: vec![quote_attr!(cx, #[inline])],
                 is_unsafe: false,
-                combine_substructure: combine_substructure(box jstraceable_substructure)
+                combine_substructure: combine_substructure(box jstraceable_substructure),
+                unify_fieldless_variants: true,
             }
         ],
         associated_types: vec![],

diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock