More review comments

Author: alexcrichton

cranelift/bitset/src/compound.rs

@@ -477,42 +477,42 @@ impl<T: ScalarBitSetStorage> CompoundBitSet<T> {
     /// # Example
     ///
     /// ```
-    /// use cranelift_bitset::CompoundBitSet;
+    /// use cranelift_bitset::{CompoundBitSet, ScalarBitSet};
     ///
     /// let mut bitset = CompoundBitSet::<u32>::default();
     ///
     /// assert_eq!(
-    ///     bitset.iter_words().collect::<Vec<_>>(),
+    ///     bitset.iter_scalars().collect::<Vec<_>>(),
     ///     [],
     /// );
     ///
     /// bitset.insert(0);
     ///
     /// assert_eq!(
-    ///     bitset.iter_words().collect::<Vec<_>>(),
-    ///     [0x1],
+    ///     bitset.iter_scalars().collect::<Vec<_>>(),
+    ///     [ScalarBitSet(0x1)],
     /// );
     ///
     /// bitset.insert(1);
     ///
     /// assert_eq!(
-    ///     bitset.iter_words().collect::<Vec<_>>(),
-    ///     [0x3],
+    ///     bitset.iter_scalars().collect::<Vec<_>>(),
+    ///     [ScalarBitSet(0x3)],
     /// );
     ///
     /// bitset.insert(32);
     ///
     /// assert_eq!(
-    ///     bitset.iter_words().collect::<Vec<_>>(),
-    ///     [0x3, 0x1],
+    ///     bitset.iter_scalars().collect::<Vec<_>>(),
+    ///     [ScalarBitSet(0x3), ScalarBitSet(0x1)],
     /// );
     /// ```
-    pub fn iter_words(&self) -> impl Iterator<Item = T> + '_ {
+    pub fn iter_scalars(&self) -> impl Iterator<Item = ScalarBitSet<T>> + '_ {
         let nwords = match self.max {
             Some(n) => 1 + (n as usize / Self::BITS_PER_SCALAR),
             None => 0,
         };
-        self.elems.iter().map(|b| b.0).take(nwords)
+        self.elems.iter().copied().take(nwords)
     }
 }
 

crates/environ/src/compile/stack_maps.rs

@@ -119,11 +119,12 @@ impl StackMapSection {
             assert!(offset % 4 == 0);
             bits.insert((offset / 4) as usize);
         }
-        let count = bits.iter_words().count();
+        let count = bits.iter_scalars().count();
         self.stack_map_data
             .push(U32Bytes::new(LittleEndian, count as u32));
-        for word in bits.iter_words() {
-            self.stack_map_data.push(U32Bytes::new(LittleEndian, word));
+        for scalar in bits.iter_scalars() {
+            self.stack_map_data
+                .push(U32Bytes::new(LittleEndian, scalar.0));
         }
     }