Skip to content

Flesh out std::rand::distributions a little more #9810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 23, 2013
2 changes: 1 addition & 1 deletion src/libextra/base64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ mod test {
use std::vec;

do 1000.times {
let times = task_rng().gen_integer_range(1u, 100);
let times = task_rng().gen_range(1u, 100);
let v = vec::from_fn(times, |_| random::<u8>());
assert_eq!(v.to_base64(STANDARD).from_base64().unwrap(), v);
}
Expand Down
2 changes: 1 addition & 1 deletion src/libextra/crypto/cryptoutil.rs
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ pub mod test {
digest.reset();

while count < total_size {
let next: uint = rng.gen_integer_range(0, 2 * blocksize + 1);
let next: uint = rng.gen_range(0, 2 * blocksize + 1);
let remaining = total_size - count;
let size = if next > remaining { remaining } else { next };
digest.input(buffer.slice_to(size));
Expand Down
2 changes: 1 addition & 1 deletion src/libextra/flate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ mod tests {
let mut r = rand::rng();
let mut words = ~[];
do 20.times {
let range = r.gen_integer_range(1u, 10);
let range = r.gen_range(1u, 10);
words.push(r.gen_vec::<u8>(range));
}
do 20.times {
Expand Down
12 changes: 6 additions & 6 deletions src/libextra/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1069,8 +1069,8 @@ mod big_tests {
isSorted(arr);

do 3.times {
let i1 = rng.gen_integer_range(0u, n);
let i2 = rng.gen_integer_range(0u, n);
let i1 = rng.gen_range(0u, n);
let i2 = rng.gen_range(0u, n);
arr.swap(i1, i2);
}
tim_sort(arr); // 3sort
Expand All @@ -1088,7 +1088,7 @@ mod big_tests {
isSorted(arr);

do (n/100).times {
let idx = rng.gen_integer_range(0u, n);
let idx = rng.gen_range(0u, n);
arr[idx] = rng.gen();
}
tim_sort(arr);
Expand Down Expand Up @@ -1141,8 +1141,8 @@ mod big_tests {
isSorted(arr);

do 3.times {
let i1 = rng.gen_integer_range(0u, n);
let i2 = rng.gen_integer_range(0u, n);
let i1 = rng.gen_range(0u, n);
let i2 = rng.gen_range(0u, n);
arr.swap(i1, i2);
}
tim_sort(arr); // 3sort
Expand All @@ -1160,7 +1160,7 @@ mod big_tests {
isSorted(arr);

do (n/100).times {
let idx = rng.gen_integer_range(0u, n);
let idx = rng.gen_range(0u, n);
arr[idx] = @rng.gen();
}
tim_sort(arr);
Expand Down
2 changes: 1 addition & 1 deletion src/libextra/treemap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ mod test_treemap {
}

do 30.times {
let r = rng.gen_integer_range(0, ctrl.len());
let r = rng.gen_range(0, ctrl.len());
let (key, _) = ctrl.remove(r);
assert!(map.remove(&key));
check_structure(&map);
Expand Down
Loading