Update for rand_core#34: removal of RngCore impl for BlockRng

Author: dhardy

Cargo.toml

@@ -88,4 +88,4 @@ serde_json = "1.0.140"
 
 [patch.crates-io.rand_core]
 git = "https://github.com/rust-random/rand_core.git"
-rev = "5d19070a"
+rev = "8d1d8577"

benches/Cargo.toml

@@ -59,4 +59,4 @@ harness = false
 
 [patch.crates-io.rand_core]
 git = "https://github.com/rust-random/rand_core.git"
-rev = "5d19070a"
+rev = "8d1d8577"

rand_chacha/src/chacha.rs

@@ -116,12 +116,12 @@ macro_rules! chacha_impl {
         impl RngCore for $ChaChaXRng {
             #[inline]
             fn next_u32(&mut self) -> u32 {
-                self.rng.next_u32()
+                self.rng.next_word()
             }
 
             #[inline]
             fn next_u64(&mut self) -> u64 {
-                self.rng.next_u64()
+                self.rng.next_u64_from_u32()
             }
 
             #[inline]

src/rngs/reseeding.rs

@@ -107,12 +107,12 @@ where
 {
     #[inline(always)]
     fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
+        self.0.next_word()
     }
 
     #[inline(always)]
     fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
+        self.0.next_u64_from_u32()
     }
 
     fn fill_bytes(&mut self, dest: &mut [u8]) {