diff options
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/deriving/rand.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libsyntax/ext/deriving/rand.rs b/src/libsyntax/ext/deriving/rand.rs index ab5ac6d7847..b890623b963 100644 --- a/src/libsyntax/ext/deriving/rand.rs +++ b/src/libsyntax/ext/deriving/rand.rs @@ -79,18 +79,19 @@ 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 u32_ty = cx.ty_ident(span, cx.ident_of("uint")); + let uint_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, false, copy rand_ident, None, ~[ u32_ty, r_ty ]); + let rand_name = cx.path_all(span, true, copy rand_ident, None, ~[ uint_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); |