languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-09-15 22:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #37120 - srinivasreddy:librand, r=nrc

Browse source 
run rustfmt on librand
This commit is contained in:
bors 2016-10-18 05:09:12 -07:00 committed by GitHub
parent 753ea76336 ca397681bb
commit 16eeeac783
5 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/librand/chacha.rs
View file

@ -217,8 +217,8 @@ fn test_rng_rand_seeded() {
let mut ra: ChaChaRng = SeedableRng::from_seed(&*s);
let mut rb: ChaChaRng = SeedableRng::from_seed(&*s);
assert!(ra.gen_ascii_chars()
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
}
#[test]
@ -227,8 +227,8 @@ fn test_rng_seeded() {
let mut ra: ChaChaRng = SeedableRng::from_seed(seed);
let mut rb: ChaChaRng = SeedableRng::from_seed(seed);
assert!(ra.gen_ascii_chars()
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
}
#[test]

12
src/librand/distributions/mod.rs
View file

@ -237,18 +237,10 @@ fn ziggurat<R: Rng, P, Z>(rng: &mut R,
// u is either U(-1, 1) or U(0, 1) depending on if this is a
// symmetric distribution or not.
let u = if symmetric {
2.0 * f - 1.0
} else {
f
};
let u = if symmetric { 2.0 * f - 1.0 } else { f };
let x = u * x_tab[i];
let test_x = if symmetric {
x.abs()
} else {
x
};
let test_x = if symmetric { x.abs() } else { x };
// algebraically equivalent to |u| < x_tab[i+1]/x_tab[i] (or u < x_tab[i+1]/x_tab[i])
if test_x < x_tab[i + 1] {

16
src/librand/isaac.rs
View file

@ -599,8 +599,8 @@ fn test_rng_32_rand_seeded() {
let mut ra: IsaacRng = SeedableRng::from_seed(&s[..]);
let mut rb: IsaacRng = SeedableRng::from_seed(&s[..]);
assert!(ra.gen_ascii_chars()
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
}
#[test]
fn test_rng_64_rand_seeded() {
@ -608,8 +608,8 @@ fn test_rng_64_rand_seeded() {
let mut ra: Isaac64Rng = SeedableRng::from_seed(&s[..]);
let mut rb: Isaac64Rng = SeedableRng::from_seed(&s[..]);
assert!(ra.gen_ascii_chars()
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
}
#[test]
@ -618,8 +618,8 @@ fn test_rng_32_seeded() {
let mut ra: IsaacRng = SeedableRng::from_seed(seed);
let mut rb: IsaacRng = SeedableRng::from_seed(seed);
assert!(ra.gen_ascii_chars()
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
}
#[test]
fn test_rng_64_seeded() {
@ -627,8 +627,8 @@ fn test_rng_64_seeded() {
let mut ra: Isaac64Rng = SeedableRng::from_seed(seed);
let mut rb: Isaac64Rng = SeedableRng::from_seed(seed);
assert!(ra.gen_ascii_chars()
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
}
#[test]

6
src/librand/rand_impls.rs
View file

@ -203,10 +203,6 @@ fn rand<R: Rng>(_: &mut R) -> () {
impl<T: Rand> Rand for Option<T> {
#[inline]
fn rand<R: Rng>(rng: &mut R) -> Option<T> {
if rng.gen() {
Some(rng.gen())
} else {
None
}
if rng.gen() { Some(rng.gen()) } else { None }
}
}

6
src/librand/reseeding.rs
View file

@ -138,7 +138,7 @@ fn next_u32(&mut self) -> u32 {
}
}
impl Default for Counter {
/// Constructs a `Counter` with initial value zero.
/// Constructs a `Counter` with initial value zero.
fn default() -> Counter {
Counter { i: 0 }
}
@ -169,8 +169,8 @@ fn test_rng_seeded() {
let mut ra: MyRng = SeedableRng::from_seed((ReseedWithDefault, 2));
let mut rb: MyRng = SeedableRng::from_seed((ReseedWithDefault, 2));
assert!(ra.gen_ascii_chars()
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
.take(100)
.eq(rb.gen_ascii_chars().take(100)));
}
#[test]