Camel case various core constructors
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
//! Random number generation
|
||||
|
||||
export Rng, rng, seed, seeded_rng, Weighted, extensions;
|
||||
export Rng, seed, seeded_rng, Weighted, extensions;
|
||||
export xorshift, seeded_xorshift;
|
||||
|
||||
#[allow(non_camel_case_types)] // runtime type
|
||||
@@ -259,7 +259,7 @@ fn seed() -> ~[u8] {
|
||||
}
|
||||
|
||||
/// Create a random number generator with a system specified seed
|
||||
fn rng() -> Rng {
|
||||
fn Rng() -> Rng {
|
||||
@RandRes(rustrt::rand_new()) as Rng
|
||||
}
|
||||
|
||||
@@ -335,7 +335,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn gen_int_range() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
let a = r.gen_int_range(-3, 42);
|
||||
assert a >= -3 && a < 42;
|
||||
assert r.gen_int_range(0, 1) == 0;
|
||||
@@ -346,12 +346,12 @@ mod tests {
|
||||
#[should_fail]
|
||||
#[ignore(cfg(windows))]
|
||||
fn gen_int_from_fail() {
|
||||
rand::rng().gen_int_range(5, -2);
|
||||
rand::Rng().gen_int_range(5, -2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn gen_uint_range() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
let a = r.gen_uint_range(3u, 42u);
|
||||
assert a >= 3u && a < 42u;
|
||||
assert r.gen_uint_range(0u, 1u) == 0u;
|
||||
@@ -362,12 +362,12 @@ mod tests {
|
||||
#[should_fail]
|
||||
#[ignore(cfg(windows))]
|
||||
fn gen_uint_range_fail() {
|
||||
rand::rng().gen_uint_range(5u, 2u);
|
||||
rand::Rng().gen_uint_range(5u, 2u);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn gen_float() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
let a = r.gen_float();
|
||||
let b = r.gen_float();
|
||||
log(debug, (a, b));
|
||||
@@ -375,14 +375,14 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn gen_weighted_bool() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
assert r.gen_weighted_bool(0u) == true;
|
||||
assert r.gen_weighted_bool(1u) == true;
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn gen_str() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
log(debug, r.gen_str(10u));
|
||||
log(debug, r.gen_str(10u));
|
||||
log(debug, r.gen_str(10u));
|
||||
@@ -393,7 +393,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn gen_bytes() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
assert r.gen_bytes(0u).len() == 0u;
|
||||
assert r.gen_bytes(10u).len() == 10u;
|
||||
assert r.gen_bytes(16u).len() == 16u;
|
||||
@@ -401,20 +401,20 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn choose() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
assert r.choose(~[1, 1, 1]) == 1;
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn choose_option() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
assert r.choose_option(~[]) == None::<int>;
|
||||
assert r.choose_option(~[1, 1, 1]) == Some(1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn choose_weighted() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
assert r.choose_weighted(~[{weight: 1u, item: 42}]) == 42;
|
||||
assert r.choose_weighted(~[
|
||||
{weight: 0u, item: 42},
|
||||
@@ -424,7 +424,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn choose_weighted_option() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
assert r.choose_weighted_option(~[{weight: 1u, item: 42}]) ==
|
||||
Some(42);
|
||||
assert r.choose_weighted_option(~[
|
||||
@@ -436,7 +436,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn weighted_vec() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
let empty: ~[int] = ~[];
|
||||
assert r.weighted_vec(~[]) == empty;
|
||||
assert r.weighted_vec(~[
|
||||
@@ -448,7 +448,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn shuffle() {
|
||||
let r = rand::rng();
|
||||
let r = rand::Rng();
|
||||
let empty: ~[int] = ~[];
|
||||
assert r.shuffle(~[]) == empty;
|
||||
assert r.shuffle(~[1, 1, 1]) == ~[1, 1, 1];
|
||||
|
||||
Reference in New Issue
Block a user