user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #7121 : huonw/rust/rand-call, r=pnkfelix

Browse source 
r? @pnkfelix
This commit is contained in:
bors 2013-06-14 22:37:13 -07:00
commit c83bceddbb
2 changed files with 45 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libsyntax/ext/deriving/rand.rs
View file

@ -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);