reinstate into_iter1

unicode-org · Dec 16, 2022 · 061953d · 061953d
1 parent 0761f89
commit 061953d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/provider/datagen/src/transform/cldr/decimal/compact.rs b/provider/datagen/src/transform/cldr/decimal/compact.rs
@@ -156,7 +156,7 @@ mod tests {
             .iter0()
             .flat_map(|kkv| {
                 let key0 = *kkv.key0();
-                kkv.iter1()
+                kkv.into_iter1()
                     .map(move |(k, v)| (key0, Count::from_unaligned(*k), Pattern::zero_from(v)))
             })
             .collect();
@@ -222,7 +222,7 @@ mod tests {
             .iter0()
             .flat_map(|kkv| {
                 let key0 = *kkv.key0();
-                kkv.iter1()
+                kkv.into_iter1()
                     .map(move |(k, v)| (key0, Count::from_unaligned(*k), Pattern::zero_from(v)))
             })
             .collect();

diff --git a/provider/datagen/src/transform/cldr/decimal/compact_decimal_pattern.rs b/provider/datagen/src/transform/cldr/decimal/compact_decimal_pattern.rs
@@ -397,7 +397,7 @@ mod tests {
             .iter0()
             .flat_map(|kkv| {
                 let key0 = *kkv.key0();
-                kkv.iter1()
+                kkv.into_iter1()
                     .map(move |(k, v)| (key0, Count::from_unaligned(*k), Pattern::zero_from(v)))
             })
             .collect();
@@ -532,7 +532,7 @@ mod tests {
             .iter0()
             .flat_map(|kkv| {
                 let key0 = *kkv.key0();
-                kkv.iter1()
+                kkv.into_iter1()
                     .map(move |(k, v)| (key0, Count::from_unaligned(*k), Pattern::zero_from(v)))
             })
             .collect();

diff --git a/utils/zerovec/src/map2d/cursor.rs b/utils/zerovec/src/map2d/cursor.rs
@@ -115,6 +115,25 @@ where
         })
     }
 
+    /// Transform this cursor into an ordered iterator over keys1 for a particular key0.
+    pub fn into_iter1(
+        self,
+    ) -> impl Iterator<
+        Item = (
+            &'l <K1 as ZeroMapKV<'a>>::GetType,
+            &'l <V as ZeroMapKV<'a>>::GetType,
+        ),
+    > {
+        let range = self.get_range();
+        #[allow(clippy::unwrap_used)] // `self.get_range()` returns a valid range
+        range.map(move |idx| {
+            (
+                self.keys1.zvl_get(idx).unwrap(),
+                self.values.zvl_get(idx).unwrap(),
+            )
+        })
+    }
+
     /// Given key0_index, returns the corresponding range of keys1, which will be valid
     pub(super) fn get_range(&self) -> Range<usize> {
         debug_assert!(self.key0_index < self.joiner.len());