OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #7216 : kballard/rust/task_rng, r=brson

Browse Source
This commit is contained in:
bors 2013-06-26 03:08:04 -07:00
commit 4ec05e02fa
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/rand.rs
View File

@ -844,7 +844,7 @@ fn tls_rng_state(_v: @@mut IsaacRng) {}
* `task_rng().gen::<int>()`.
*/
#[inline]
pub fn task_rng() -> @@mut IsaacRng {
pub fn task_rng() -> @mut IsaacRng {
let r : Option<@@mut IsaacRng>;
unsafe {
r = local_data::local_data_get(tls_rng_state);
@ -854,20 +854,18 @@ pub fn task_rng() -> @@mut IsaacRng {
unsafe {
let rng = @@mut IsaacRng::new_seeded(seed());
local_data::local_data_set(tls_rng_state, rng);
rng
*rng
}
}
Some(rng) => rng
Some(rng) => *rng
}
}
// Allow direct chaining with `task_rng`
impl<R: Rng> Rng for @@mut R {
impl<R: Rng> Rng for @mut R {
#[inline]
fn next(&mut self) -> u32 {
match *self {
@@ref mut r => r.next()
}
(**self).next()
}
}
@ -877,9 +875,7 @@ impl<R: Rng> Rng for @@mut R {
*/
#[inline]
pub fn random<T: Rand>() -> T {
match *task_rng() {
@ref mut r => r.gen()
}
task_rng().gen()
}
#[cfg(test)]