---

yaml
---
r: 145826
b: refs/heads/try2
c: 9db32a2
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 98869799eb2604ecd7c947db117794df10890a2c
+refs/heads/try2: 9db32a2f1d2cfafc519941475f5e660a9ae076f0
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rand/rand_impls.rs

@@ -14,7 +14,6 @@ use char;
 use int;
 use option::{Option, Some, None};
 use rand::{Rand,Rng};
-use u32;
 use uint;
 
 impl Rand for int {
@@ -96,21 +95,23 @@ impl Rand for u64 {
 }
 
 impl Rand for f32 {
+    /// A random `f32` in the range `[0, 1)`.
     #[inline]
     fn rand<R: Rng>(rng: &mut R) -> f32 {
-        rng.gen::<f64>() as f32
+        // weird, but this is the easiest way to get 2**32
+        static SCALE: f32 = 2.0 * (1u32 << 31) as f32;
+        rng.next_u32() as f32 / SCALE
     }
 }
 
-static SCALE : f64 = (u32::max_value as f64) + 1.0f64;
 impl Rand for f64 {
+    /// A random `f64` in the range `[0, 1)`.
     #[inline]
     fn rand<R: Rng>(rng: &mut R) -> f64 {
-        let u1 = rng.next_u32() as f64;
-        let u2 = rng.next_u32() as f64;
-        let u3 = rng.next_u32() as f64;
+        // weird, but this is the easiest way to get 2**64
+        static SCALE: f64 = 2.0 * (1u64 << 63) as f64;
 
-        ((u1 / SCALE + u2) / SCALE + u3) / SCALE
+        rng.next_u64() as f64 / SCALE
     }
 }