run rustfmt on librand

rust-lang · Oct 12, 2016 · ca39768 · ca39768
1 parent acb50e3
commit ca39768
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 30 deletions.
diff --git a/src/librand/chacha.rs b/src/librand/chacha.rs
@@ -217,8 +217,8 @@ mod tests {
         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 @@ mod tests {
         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]

diff --git a/src/librand/distributions/mod.rs b/src/librand/distributions/mod.rs
@@ -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] {

diff --git a/src/librand/isaac.rs b/src/librand/isaac.rs
@@ -599,17 +599,17 @@ mod tests {
         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() {
         let s = ::test::rng().gen_iter::<u64>().take(256).collect::<Vec<u64>>();
         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,17 +618,17 @@ mod tests {
         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() {
         let seed: &[_] = &[1, 23, 456, 7890, 12345];
         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]

diff --git a/src/librand/rand_impls.rs b/src/librand/rand_impls.rs
@@ -203,10 +203,6 @@ tuple_impl!{A, B, C, D, E, F, G, H, I, J, K, L}
 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 }
     }
 }
diff --git a/src/librand/reseeding.rs b/src/librand/reseeding.rs
@@ -138,7 +138,7 @@ mod tests {
         }
     }
     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 @@ mod tests {
         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]