---

yaml
---
r: 82250
b: refs/heads/master
c: 62feded
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 618c6afe3232d0cc3750178d4f301352684ddde6
+refs/heads/master: 62fededd8e9cfd85197f224123a057df43a6feab
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/libstd/rand/isaac.rs

@@ -363,6 +363,12 @@ impl Isaac64Rng {
 }
 
 impl Rng for Isaac64Rng {
+    // FIXME #7771: having next_u32 like this should be unnecessary
+    #[inline]
+    fn next_u32(&mut self) -> u32 {
+        self.next_u64() as u32
+    }
+
     #[inline]
     fn next_u64(&mut self) -> u64 {
         if self.cnt == 0 {

trunk/src/libstd/rand/mod.rs

@@ -99,12 +99,8 @@ pub trait Rng {
     /// Return the next random u32. This rarely needs to be called
     /// directly, prefer `r.gen()` to `r.next_u32()`.
     ///
-    /// By default this is implemented in terms of `next_u64`. An
-    /// implementation of this trait must provide at least one of
-    /// these two methods.
-    fn next_u32(&mut self) -> u32 {
-        self.next_u64() as u32
-    }
+    // FIXME #7771: Should be implemented in terms of next_u64
+    fn next_u32(&mut self) -> u32;
 
     /// Return the next random u64. This rarely needs to be called
     /// directly, prefer `r.gen()` to `r.next_u64()`.

trunk/src/libstd/rand/rand_impls.rs

@@ -209,6 +209,9 @@ mod tests {
     use rand::Rng;
     struct ConstantRng(u64);
     impl Rng for ConstantRng {
+        fn next_u32(&mut self) -> u32 {
+            (**self) as u32
+        }
         fn next_u64(&mut self) -> u64 {
             **self
         }