Skip to content

Commit 535244c

Browse files
committed
auto merge of #5987 : huonw/rust/generic-random, r=catamorphism
With this patch `rand::random` can be used to generate anything that implements `Rand`.
2 parents 8942099 + aa763cd commit 535244c

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/libcore/rand.rs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ impl Rand for i64 {
5555
}
5656
}
5757

58+
impl Rand for uint {
59+
fn rand(rng: @rand::Rng) -> uint {
60+
rng.gen_uint()
61+
}
62+
}
63+
5864
impl Rand for u8 {
5965
fn rand(rng: @rand::Rng) -> u8 {
6066
rng.gen_u8()
@@ -149,6 +155,7 @@ pub struct Weighted<T> {
149155
}
150156

151157
pub trait RngUtil {
158+
/// Return a random value for a Rand type
152159
fn gen<T:Rand>(&self) -> T;
153160
/**
154161
* Return a random int
@@ -739,10 +746,11 @@ pub fn task_rng() -> @Rng {
739746
}
740747

741748
/**
742-
* Returns a random uint, using the task's based random number generator.
749+
* Returns a random value of a Rand type, using the task's random number
750+
* generator.
743751
*/
744-
pub fn random() -> uint {
745-
task_rng().gen_uint()
752+
pub fn random<T: Rand>() -> T {
753+
task_rng().gen()
746754
}
747755

748756

@@ -915,8 +923,10 @@ mod tests {
915923

916924
#[test]
917925
fn random() {
918-
// not sure how to test this aside from just getting a number
926+
// not sure how to test this aside from just getting some values
919927
let _n : uint = rand::random();
928+
let _f : f32 = rand::random();
929+
let _o : Option<Option<i8>> = rand::random();
920930
}
921931
}
922932

0 commit comments

Comments
 (0)