fix Debug impl, rename levels

Author: newpavlov

rand_core/src/block.rs

@@ -87,8 +87,8 @@ pub trait BlockRngCore {
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 enum IndexLevel {
-    Bit,
-    Byte,
+    U1,
+    U8,
     U32,
     U64,
 }
@@ -98,18 +98,18 @@ impl IndexLevel {
     fn convert(&mut self, index: usize, level: Self) -> usize {
         use IndexLevel::*;
         let res = match (*self, level) {
-            (Bit, Bit) | (Byte, Byte) | (U32, U32) | (U64, U64) => return index,
-            (Bit, Byte) => (index / 8) + ((index & 0b111) != 0) as usize,
-            (Bit, U32) => (index / 32) + ((index & 0b1_1111) != 0) as usize,
-            (Bit, U64) => (index / 64) + ((index & 0b11_1111) != 0) as usize,
-            (Byte, Bit) => 8 * index,
-            (Byte, U32) => (index / 4) + ((index & 0b11) != 0) as usize,
-            (Byte, U64) => (index / 8) + ((index & 0b111) != 0) as usize,
-            (U32, Bit) => 32 * index,
-            (U32, Byte) => 4 * index,
+            (U1, U1) | (U8, U8) | (U32, U32) | (U64, U64) => return index,
+            (U1, U8) => (index / 8) + ((index & 0b111) != 0) as usize,
+            (U1, U32) => (index / 32) + ((index & 0b1_1111) != 0) as usize,
+            (U1, U64) => (index / 64) + ((index & 0b11_1111) != 0) as usize,
+            (U8, U1) => 8 * index,
+            (U8, U32) => (index / 4) + ((index & 0b11) != 0) as usize,
+            (U8, U64) => (index / 8) + ((index & 0b111) != 0) as usize,
+            (U32, U1) => 32 * index,
+            (U32, U8) => 4 * index,
             (U32, U64) => (index / 2) + ((index & 0b1) != 0) as usize,
-            (U64, Bit) => 64 * index,
-            (U64, Byte) => 8 * index,
+            (U64, U1) => 64 * index,
+            (U64, U8) => 8 * index,
             (U64, U32) => 2 * index,
         };
         *self = level;
@@ -167,8 +167,9 @@ impl<R: BlockRngCore + fmt::Debug> fmt::Debug for BlockRng<R> {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         fmt.debug_struct("BlockRng")
             .field("core", &self.core)
-            .field("result_len", &self.results.as_ref().len())
+            .field("result_len", &self.get_results_u8().len())
             .field("index", &self.index)
+            .field("level", &self.level)
             .finish()
     }
 }
@@ -180,7 +181,7 @@ impl<R: BlockRngCore> BlockRng<R> {
     pub fn new(core: R) -> BlockRng<R> {
         let results = R::Results::default();
         let index = AsRef::<[u8]>::as_ref(&results).len();
-        BlockRng { core, results, index, level: IndexLevel::Byte }
+        BlockRng { core, results, index, level: IndexLevel::U8 }
     }
 
     #[inline(always)]
@@ -205,7 +206,7 @@ where
 {
     #[inline]
     fn next_bool(&mut self) -> bool {
-        let index = self.level.convert(self.index, IndexLevel::Bit);
+        let index = self.level.convert(self.index, IndexLevel::U1);
         match self.get_results_u8().get(index / 8) {
             Some(&v) => {
                 self.index = index + 1;
@@ -258,7 +259,7 @@ where
 
     #[inline]
     fn try_fill_bytes(&mut self, mut dest: &mut [u8]) -> Result<(), Error> {
-        let index = self.level.convert(self.index, IndexLevel::Byte);
+        let index = self.level.convert(self.index, IndexLevel::U8);
 
         let rlen = self.get_results_u8().len();
         if index < rlen {