---

yaml
---
r: 95294
b: refs/heads/dist-snap
c: 62feded
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 618c6afe3232d0cc3750178d4f301352684ddde6
+refs/heads/dist-snap: 62fededd8e9cfd85197f224123a057df43a6feab
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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 {

branches/dist-snap/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()`.

branches/dist-snap/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
         }