---

yaml
---
r: 65917
b: refs/heads/master
c: 1adbb45
h: refs/heads/master
i:
  65915: 0974675
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c83bceddbb497464f8e4e1990f7518b009cd61ca
+refs/heads/master: 1adbb4520b0f3dafed2e19ace7a61518cc05af4f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/librustc/middle/lang_items.rs

@@ -441,5 +441,6 @@ pub fn collect_language_items(crate: @crate,
     let mut collector = LanguageItemCollector(crate, session);
     collector.collect();
     let LanguageItemCollector { items, _ } = collector;
+    session.abort_if_errors();
     items
 }

trunk/src/libsyntax/ext/deriving/rand.rs

@@ -79,19 +79,18 @@ fn rand_substructure(cx: @ExtCtxt, span: span, substr: &Substructure) -> @expr {
             let variant_count = cx.expr_uint(span, variants.len());
 
             // need to specify the uint-ness of the random number
-            let uint_ty = cx.ty_ident(span, cx.ident_of("uint"));
+            let u32_ty = cx.ty_ident(span, cx.ident_of("uint"));
             let r_ty = cx.ty_ident(span, cx.ident_of("R"));
-            let rand_name = cx.path_all(span, true, copy rand_ident, None, ~[ uint_ty, r_ty ]);
+            let rand_name = cx.path_all(span, false, copy rand_ident, None, ~[ u32_ty, r_ty ]);
             let rand_name = cx.expr_path(rand_name);
 
-            // ::std::rand::Rand::rand::<uint>(rng)
             let rv_call = cx.expr_call(span,
                                        rand_name,
                                        ~[ rng[0].duplicate(cx) ]);
 
             // rand() % variants.len()
             let rand_variant = cx.expr_binary(span, ast::rem,
-                                              rv_call, variant_count);
+                                                rv_call, variant_count);
 
             let mut arms = do variants.mapi |i, id_sum| {
                 let i_expr = cx.expr_uint(span, i);