From f11594a5ad8ccf2f647f9342a7f132e0f3edb245 Mon Sep 17 00:00:00 2001 From: martinvuyk Date: Fri, 28 Feb 2025 17:20:44 -0300 Subject: [PATCH] change _StringSliceIter to CodepointSliceIter Signed-off-by: martinvuyk --- mojo/stdlib/src/builtin/range.mojo | 14 +++++++------- mojo/stdlib/src/builtin/reversed.mojo | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mojo/stdlib/src/builtin/range.mojo b/mojo/stdlib/src/builtin/range.mojo index d91f748a6f..78b393a218 100644 --- a/mojo/stdlib/src/builtin/range.mojo +++ b/mojo/stdlib/src/builtin/range.mojo @@ -25,7 +25,7 @@ from python import ( ) # TODO: remove this and fixup downstream imports from utils._select import _select_register_value as select -from collections.string.string_slice import StringSlice, _StringSliceIter +from collections.string.string_slice import StringSlice, CodepointSliceIter from collections.list import _ListIter from collections.dict import ( Dict, @@ -750,7 +750,7 @@ fn iter[ @always_inline -fn iter(ref value: String) -> _StringSliceIter[__origin_of(value)]: +fn iter(ref value: String) -> CodepointSliceIter[__origin_of(value)]: """Return an iterator. Args: @@ -763,7 +763,7 @@ fn iter(ref value: String) -> _StringSliceIter[__origin_of(value)]: @always_inline -fn iter(value: StringLiteral) -> _StringSliceIter[StaticConstantOrigin]: +fn iter(value: StringLiteral) -> CodepointSliceIter[StaticConstantOrigin]: """Return an iterator. Args: @@ -772,11 +772,11 @@ fn iter(value: StringLiteral) -> _StringSliceIter[StaticConstantOrigin]: Returns: The type's Iterator. """ - return rebind[_StringSliceIter[StaticConstantOrigin]](value.__iter__()) + return rebind[CodepointSliceIter[StaticConstantOrigin]](value.__iter__()) @always_inline -fn iter(value: StringSlice) -> _StringSliceIter[__type_of(value).origin]: +fn iter(value: StringSlice) -> CodepointSliceIter[__type_of(value).origin]: """Return an iterator. Args: @@ -785,7 +785,7 @@ fn iter(value: StringSlice) -> _StringSliceIter[__type_of(value).origin]: Returns: The type's Iterator. """ - return rebind[_StringSliceIter[__type_of(value).origin]](value.__iter__()) + return rebind[CodepointSliceIter[__type_of(value).origin]](value.__iter__()) @always_inline @@ -932,7 +932,7 @@ fn next[ @always_inline -fn next(mut value: _StringSliceIter) -> StringSlice[__type_of(value).origin]: +fn next(mut value: CodepointSliceIter) -> StringSlice[__type_of(value).origin]: """Return an iterator. Args: diff --git a/mojo/stdlib/src/builtin/reversed.mojo b/mojo/stdlib/src/builtin/reversed.mojo index 238e76dc01..fda8fb7b97 100644 --- a/mojo/stdlib/src/builtin/reversed.mojo +++ b/mojo/stdlib/src/builtin/reversed.mojo @@ -19,7 +19,7 @@ from collections import Deque, Dict from collections.deque import _DequeIter from collections.dict import _DictEntryIter, _DictKeyIter, _DictValueIter from collections.list import _ListIter -from collections.string.string_slice import _StringSliceIter, StringSlice +from collections.string.string_slice import CodepointSliceIter, StringSlice from memory.span import Span, _SpanIter @@ -214,7 +214,7 @@ fn reversed[ return value.__reversed__() -alias _S = _StringSliceIter[_, forward=False] +alias _S = CodepointSliceIter[_, forward=False] @always_inline