create 3 explicit impls for IntoIterator for snapshot-collections

starkware-libs · Jan 7, 2025 · 09d696f · 09d696f
1 parent 7b3c22b
commit 09d696f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/corelib/src/array.cairo b/corelib/src/array.cairo
@@ -816,13 +816,6 @@ impl SpanIntoIterator<T> of crate::iter::IntoIterator<Span<T>> {
     }
 }
 
-impl SnapshotSpanIntoIterator<T> of crate::iter::IntoIterator<@Span<T>> {
-    type IntoIter = crate::array::SpanIter<T>;
-    fn into_iter(self: @Span<T>) -> Self::IntoIter {
-        (*self).into_iter()
-    }
-}
-
 /// An iterator struct over an array collection.
 #[derive(Drop)]
 pub struct ArrayIter<T> {

diff --git a/corelib/src/iter/traits/collect.cairo b/corelib/src/iter/traits/collect.cairo
@@ -96,10 +96,25 @@ impl IteratorIntoIterator<T, +Iterator<T>> of IntoIterator<T> {
     }
 }
 
-impl SnapshotIteratorSpanBased<C, T, +Into<@C, Span<T>>> of IntoIterator<@C> {
+impl SnapshotFixedSizeArrayIntoIterator<
+    T, const SIZE: usize, +Drop<T>, impl ToSpan: core::array::ToSpanTrait<[T; SIZE], T>,
+> of IntoIterator<@[T; SIZE]> {
     type IntoIter = crate::array::SpanIter<T>;
-    fn into_iter(self: @C) -> Self::IntoIter {
-        let span: Span<T> = self.into();
-        span.into_iter()
+    fn into_iter(self: @[T; SIZE]) -> Self::IntoIter {
+        ToSpan::span(self).into_iter()
+    }
+}
+
+impl SnapshotSpanIntoIterator<T> of IntoIterator<@Span<T>> {
+    type IntoIter = crate::array::SpanIter<T>;
+    fn into_iter(self: @Span<T>) -> Self::IntoIter {
+        (*self).into_iter()
+    }
+}
+
+impl SnapshotArrayIntoIterator<T> of IntoIterator<@Array<T>> {
+    type IntoIter = crate::array::SpanIter<T>;
+    fn into_iter(self: @Array<T>) -> Self::IntoIter {
+        self.span().into_iter()
     }
 }