Skip to content

Commit

Permalink
Rename TaskRng to ThreadRng
Browse files Browse the repository at this point in the history
Since runtime is removed, rust has no tasks anymore and everything is moving
from being task-* to thread-*. Let’s rename TaskRng as well!

* Rename TaskRng to ThreadRng
* Rename task_rng to thread_rng

[breaking-change]
  • Loading branch information
nagisa committed Dec 28, 2014
1 parent 0201334 commit 1e89bbc
Show file tree
Hide file tree
Showing 21 changed files with 98 additions and 98 deletions.
6 changes: 3 additions & 3 deletions src/libcollections/slice.rs
Expand Up @@ -1347,7 +1347,7 @@ mod tests {
use core::cell::Cell;
use core::default::Default;
use core::mem;
use std::rand::{Rng, task_rng};
use std::rand::{Rng, thread_rng};
use std::rc::Rc;
use super::ElementSwaps;

Expand Down Expand Up @@ -1963,7 +1963,7 @@ mod tests {
fn test_sort() {
for len in range(4u, 25) {
for _ in range(0i, 100) {
let mut v = task_rng().gen_iter::<uint>().take(len)
let mut v = thread_rng().gen_iter::<uint>().take(len)
.collect::<Vec<uint>>();
let mut v1 = v.clone();

Expand Down Expand Up @@ -1999,7 +1999,7 @@ mod tests {
// number this element is, i.e. the second elements
// will occur in sorted order.
let mut v = range(0, len).map(|_| {
let n = task_rng().gen::<uint>() % 10;
let n = thread_rng().gen::<uint>() % 10;
counts[n] += 1;
(n, counts[n])
}).collect::<Vec<(uint, int)>>();
Expand Down
2 changes: 1 addition & 1 deletion src/libflate/lib.rs
Expand Up @@ -112,7 +112,7 @@ mod tests {

#[test]
fn test_flate_round_trip() {
let mut r = rand::task_rng();
let mut r = rand::thread_rng();
let mut words = vec!();
for _ in range(0u, 20) {
let range = r.gen_range(1u, 10);
Expand Down
2 changes: 1 addition & 1 deletion src/librand/distributions/exponential.rs
Expand Up @@ -64,7 +64,7 @@ impl Rand for Exp1 {
/// use std::rand::distributions::{Exp, IndependentSample};
///
/// let exp = Exp::new(2.0);
/// let v = exp.ind_sample(&mut rand::task_rng());
/// let v = exp.ind_sample(&mut rand::thread_rng());
/// println!("{} is from a Exp(2) distribution", v);
/// ```
#[deriving(Copy)]
Expand Down
8 changes: 4 additions & 4 deletions src/librand/distributions/gamma.rs
Expand Up @@ -44,7 +44,7 @@ use super::{IndependentSample, Sample, Exp};
/// use std::rand::distributions::{IndependentSample, Gamma};
///
/// let gamma = Gamma::new(2.0, 5.0);
/// let v = gamma.ind_sample(&mut rand::task_rng());
/// let v = gamma.ind_sample(&mut rand::thread_rng());
/// println!("{} is from a Gamma(2, 5) distribution", v);
/// ```
///
Expand Down Expand Up @@ -191,7 +191,7 @@ impl IndependentSample<f64> for GammaLargeShape {
/// use std::rand::distributions::{ChiSquared, IndependentSample};
///
/// let chi = ChiSquared::new(11.0);
/// let v = chi.ind_sample(&mut rand::task_rng());
/// let v = chi.ind_sample(&mut rand::thread_rng());
/// println!("{} is from a χ²(11) distribution", v)
/// ```
pub struct ChiSquared {
Expand Down Expand Up @@ -248,7 +248,7 @@ impl IndependentSample<f64> for ChiSquared {
/// use std::rand::distributions::{FisherF, IndependentSample};
///
/// let f = FisherF::new(2.0, 32.0);
/// let v = f.ind_sample(&mut rand::task_rng());
/// let v = f.ind_sample(&mut rand::thread_rng());
/// println!("{} is from an F(2, 32) distribution", v)
/// ```
pub struct FisherF {
Expand Down Expand Up @@ -292,7 +292,7 @@ impl IndependentSample<f64> for FisherF {
/// use std::rand::distributions::{StudentT, IndependentSample};
///
/// let t = StudentT::new(11.0);
/// let v = t.ind_sample(&mut rand::task_rng());
/// let v = t.ind_sample(&mut rand::thread_rng());
/// println!("{} is from a t(11) distribution", v)
/// ```
pub struct StudentT {
Expand Down
2 changes: 1 addition & 1 deletion src/librand/distributions/mod.rs
Expand Up @@ -96,7 +96,7 @@ pub struct Weighted<T> {
/// Weighted { weight: 4, item: 'b' },
/// Weighted { weight: 1, item: 'c' });
/// let wc = WeightedChoice::new(items.as_mut_slice());
/// let mut rng = rand::task_rng();
/// let mut rng = rand::thread_rng();
/// for _ in range(0u, 16) {
/// // on average prints 'a' 4 times, 'b' 8 and 'c' twice.
/// println!("{}", wc.ind_sample(&mut rng));
Expand Down
4 changes: 2 additions & 2 deletions src/librand/distributions/normal.rs
Expand Up @@ -81,7 +81,7 @@ impl Rand for StandardNormal {
///
/// // mean 2, standard deviation 3
/// let normal = Normal::new(2.0, 3.0);
/// let v = normal.ind_sample(&mut rand::task_rng());
/// let v = normal.ind_sample(&mut rand::thread_rng());
/// println!("{} is from a N(2, 9) distribution", v)
/// ```
#[deriving(Copy)]
Expand Down Expand Up @@ -129,7 +129,7 @@ impl IndependentSample<f64> for Normal {
///
/// // mean 2, standard deviation 3
/// let log_normal = LogNormal::new(2.0, 3.0);
/// let v = log_normal.ind_sample(&mut rand::task_rng());
/// let v = log_normal.ind_sample(&mut rand::thread_rng());
/// println!("{} is from an ln N(2, 9) distribution", v)
/// ```
#[deriving(Copy)]
Expand Down
2 changes: 1 addition & 1 deletion src/librand/distributions/range.rs
Expand Up @@ -39,7 +39,7 @@ use distributions::{Sample, IndependentSample};
///
/// fn main() {
/// let between = Range::new(10u, 10000u);
/// let mut rng = std::rand::task_rng();
/// let mut rng = std::rand::thread_rng();
/// let mut sum = 0;
/// for _ in range(0u, 1000) {
/// sum += between.ind_sample(&mut rng);
Expand Down
36 changes: 18 additions & 18 deletions src/librand/lib.rs
Expand Up @@ -138,10 +138,10 @@ pub trait Rng {
/// # Example
///
/// ```rust
/// use std::rand::{task_rng, Rng};
/// use std::rand::{thread_rng, Rng};
///
/// let mut v = [0u8, .. 13579];
/// task_rng().fill_bytes(&mut v);
/// thread_rng().fill_bytes(&mut v);
/// println!("{}", v.as_slice());
/// ```
fn fill_bytes(&mut self, dest: &mut [u8]) {
Expand Down Expand Up @@ -173,9 +173,9 @@ pub trait Rng {
/// # Example
///
/// ```rust
/// use std::rand::{task_rng, Rng};
/// use std::rand::{thread_rng, Rng};
///
/// let mut rng = task_rng();
/// let mut rng = thread_rng();
/// let x: uint = rng.gen();
/// println!("{}", x);
/// println!("{}", rng.gen::<(f64, bool)>());
Expand All @@ -191,9 +191,9 @@ pub trait Rng {
/// # Example
///
/// ```
/// use std::rand::{task_rng, Rng};
/// use std::rand::{thread_rng, Rng};
///
/// let mut rng = task_rng();
/// let mut rng = thread_rng();
/// let x = rng.gen_iter::<uint>().take(10).collect::<Vec<uint>>();
/// println!("{}", x);
/// println!("{}", rng.gen_iter::<(f64, bool)>().take(5)
Expand All @@ -218,9 +218,9 @@ pub trait Rng {
/// # Example
///
/// ```rust
/// use std::rand::{task_rng, Rng};
/// use std::rand::{thread_rng, Rng};
///
/// let mut rng = task_rng();
/// let mut rng = thread_rng();
/// let n: uint = rng.gen_range(0u, 10);
/// println!("{}", n);
/// let m: f64 = rng.gen_range(-40.0f64, 1.3e5f64);
Expand All @@ -236,9 +236,9 @@ pub trait Rng {
/// # Example
///
/// ```rust
/// use std::rand::{task_rng, Rng};
/// use std::rand::{thread_rng, Rng};
///
/// let mut rng = task_rng();
/// let mut rng = thread_rng();
/// println!("{}", rng.gen_weighted_bool(3));
/// ```
fn gen_weighted_bool(&mut self, n: uint) -> bool {
Expand All @@ -250,9 +250,9 @@ pub trait Rng {
/// # Example
///
/// ```rust
/// use std::rand::{task_rng, Rng};
/// use std::rand::{thread_rng, Rng};
///
/// let s: String = task_rng().gen_ascii_chars().take(10).collect();
/// let s: String = thread_rng().gen_ascii_chars().take(10).collect();
/// println!("{}", s);
/// ```
fn gen_ascii_chars<'a>(&'a mut self) -> AsciiGenerator<'a, Self> {
Expand All @@ -266,10 +266,10 @@ pub trait Rng {
/// # Example
///
/// ```
/// use std::rand::{task_rng, Rng};
/// use std::rand::{thread_rng, Rng};
///
/// let choices = [1i, 2, 4, 8, 16, 32];
/// let mut rng = task_rng();
/// let mut rng = thread_rng();
/// println!("{}", rng.choose(&choices));
/// assert_eq!(rng.choose(choices[..0]), None);
/// ```
Expand All @@ -286,9 +286,9 @@ pub trait Rng {
/// # Example
///
/// ```rust
/// use std::rand::{task_rng, Rng};
/// use std::rand::{thread_rng, Rng};
///
/// let mut rng = task_rng();
/// let mut rng = thread_rng();
/// let mut y = [1i, 2, 3];
/// rng.shuffle(&mut y);
/// println!("{}", y.as_slice());
Expand Down Expand Up @@ -520,8 +520,8 @@ mod test {
}
}

pub fn rng() -> MyRng<rand::TaskRng> {
MyRng { inner: rand::task_rng() }
pub fn rng() -> MyRng<rand::ThreadRng> {
MyRng { inner: rand::thread_rng() }
}

pub fn weak_rng() -> MyRng<rand::XorShiftRng> {
Expand Down
6 changes: 3 additions & 3 deletions src/librand/rand_impls.rs
Expand Up @@ -215,7 +215,7 @@ impl<T:Rand> Rand for Option<T> {
#[cfg(test)]
mod tests {
use std::prelude::*;
use std::rand::{Rng, task_rng, Open01, Closed01};
use std::rand::{Rng, thread_rng, Open01, Closed01};

struct ConstantRng(u64);
impl Rng for ConstantRng {
Expand All @@ -240,7 +240,7 @@ mod tests {
fn rand_open() {
// this is unlikely to catch an incorrect implementation that
// generates exactly 0 or 1, but it keeps it sane.
let mut rng = task_rng();
let mut rng = thread_rng();
for _ in range(0u, 1_000) {
// strict inequalities
let Open01(f) = rng.gen::<Open01<f64>>();
Expand All @@ -253,7 +253,7 @@ mod tests {

#[test]
fn rand_closed() {
let mut rng = task_rng();
let mut rng = thread_rng();
for _ in range(0u, 1_000) {
// strict inequalities
let Closed01(f) = rng.gen::<Closed01<f64>>();
Expand Down
4 changes: 2 additions & 2 deletions src/libregex/test/bench.rs
Expand Up @@ -9,7 +9,7 @@
// except according to those terms.
#![allow(non_snake_case)]

use std::rand::{Rng, task_rng};
use std::rand::{Rng, thread_rng};
use stdtest::Bencher;

use regex::{Regex, NoExpand};
Expand Down Expand Up @@ -154,7 +154,7 @@ fn medium() -> Regex { regex!("[XYZ]ABCDEFGHIJKLMNOPQRSTUVWXYZ$") }
fn hard() -> Regex { regex!("[ -~]*ABCDEFGHIJKLMNOPQRSTUVWXYZ$") }

fn gen_text(n: uint) -> String {
let mut rng = task_rng();
let mut rng = thread_rng();
let mut bytes = rng.gen_ascii_chars().map(|n| n as u8).take(n)
.collect::<Vec<u8>>();
for (i, b) in bytes.iter_mut().enumerate() {
Expand Down
4 changes: 2 additions & 2 deletions src/libserialize/base64.rs
Expand Up @@ -392,10 +392,10 @@ mod tests {

#[test]
fn test_base64_random() {
use std::rand::{task_rng, random, Rng};
use std::rand::{thread_rng, random, Rng};

for _ in range(0u, 1000) {
let times = task_rng().gen_range(1u, 100);
let times = thread_rng().gen_range(1u, 100);
let v = Vec::from_fn(times, |_| random::<u8>());
assert_eq!(v.to_base64(STANDARD)
.from_base64()
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/hash.rs
Expand Up @@ -79,7 +79,7 @@ impl RandomSipHasher {
/// Construct a new `RandomSipHasher` that is initialized with random keys.
#[inline]
pub fn new() -> RandomSipHasher {
let mut r = rand::task_rng();
let mut r = rand::thread_rng();
let r0 = r.gen();
let r1 = r.gen();
RandomSipHasher {
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/os.rs
Expand Up @@ -1438,7 +1438,7 @@ mod tests {
}

fn make_rand_name() -> String {
let mut rng = rand::task_rng();
let mut rng = rand::thread_rng();
let n = format!("TEST{}", rng.gen_ascii_chars().take(10u)
.collect::<String>());
assert!(getenv(n.as_slice()).is_none());
Expand Down

0 comments on commit 1e89bbc

Please sign in to comment.