diff options
author | MacDue <macdue@dueutil.tech> | 2023-02-05 19:02:54 +0000 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2023-02-08 19:15:45 +0000 |
commit | 63b11030f03e5a0fd06d9c8cfa788da0388096d8 (patch) | |
tree | 3ea0fa1e751683b643c71da95b6ecf98a97508cf /Meta/Lagom | |
parent | 1c92e6ee9d1f686f20f37445150d63ae474b7e9b (diff) | |
download | serenity-63b11030f03e5a0fd06d9c8cfa788da0388096d8.zip |
Everywhere: Use ReadonlySpan<T> instead of Span<T const>
Diffstat (limited to 'Meta/Lagom')
8 files changed, 23 insertions, 23 deletions
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp index c9da83a0d4..c54b4fbd45 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp @@ -2215,7 +2215,7 @@ ErrorOr<Vector<CalendarRangePattern>> get_calendar_range12_formats(StringView lo return result; } -static ErrorOr<Span<@string_index_type@ const>> find_calendar_symbols(StringView locale, StringView calendar, CalendarSymbol symbol, CalendarPatternStyle style) +static ErrorOr<ReadonlySpan<@string_index_type@>> find_calendar_symbols(StringView locale, StringView calendar, CalendarSymbol symbol, CalendarPatternStyle style) { if (auto const* data = TRY(find_calendar_data(locale, calendar)); data != nullptr) { auto const& symbols_list = s_calendar_symbol_lists[data->symbols]; @@ -2243,7 +2243,7 @@ static ErrorOr<Span<@string_index_type@ const>> find_calendar_symbols(StringView return s_symbol_lists.at(symbol_list_index); } - return Span<@string_index_type@ const> {}; + return ReadonlySpan<@string_index_type@> {}; } ErrorOr<Optional<StringView>> get_calendar_era_symbol(StringView locale, StringView calendar, CalendarPatternStyle style, Era value) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp index ff66825642..cace43b441 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp @@ -1127,7 +1127,7 @@ struct TextLayout { generate_available_values(generator, "get_available_currencies"sv, cldr.currencies); generator.append(R"~~~( -Span<StringView const> get_available_keyword_values(StringView key) +ReadonlySpan<StringView> get_available_keyword_values(StringView key) { auto key_value = key_from_string(key); if (!key_value.has_value()) @@ -1521,7 +1521,7 @@ Optional<StringView> get_locale_@enum_snake@_mapping(StringView locale, StringVi generate_value_to_string(generator, "{}_to_string"sv, "CharacterOrder"sv, "character_order"sv, format_identifier, cldr.character_orders); generator.append(R"~~~( -static Span<@string_index_type@ const> find_keyword_indices(StringView locale, StringView key) +static ReadonlySpan<@string_index_type@> find_keyword_indices(StringView locale, StringView key) { auto locale_value = locale_from_string(locale); if (!locale_value.has_value()) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp index 1ecd5b9521..879f85fd92 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp @@ -915,7 +915,7 @@ static Optional<NumberSystem> keyword_to_number_system(KeywordNumbers keyword) } } -Optional<Span<u32 const>> get_digits_for_number_system(StringView system) +Optional<ReadonlySpan<u32>> get_digits_for_number_system(StringView system) { auto number_system_keyword = keyword_nu_from_string(system); if (!number_system_keyword.has_value()) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp index 5f26c62a9e..ebbf19492d 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp @@ -622,7 +622,7 @@ PluralCategory determine_plural_category(StringView locale, PluralForm form, Plu return decider(move(operands)); } -Span<PluralCategory const> available_plural_categories(StringView locale, PluralForm form) +ReadonlySpan<PluralCategory> available_plural_categories(StringView locale, PluralForm form) { auto locale_value = locale_from_string(locale); if (!locale_value.has_value()) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp index f58d04ac85..a1839d01de 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp @@ -151,7 +151,7 @@ struct AK::Formatter<TimeZone::Location> : Formatter<FormatString> { } }; -static Optional<DateTime> parse_date_time(Span<StringView const> segments) +static Optional<DateTime> parse_date_time(ReadonlySpan<StringView> segments) { auto comment_index = find_index(segments.begin(), segments.end(), "#"sv); if (comment_index != segments.size()) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp index 0d4229d048..a3f3e6692b 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp @@ -228,9 +228,9 @@ struct EmojiData { return emoji; } - constexpr Span<u32 const> code_points() const + constexpr ReadonlySpan<u32> code_points() const { - return Span<u32 const>(s_emoji_code_points.data() + code_point_start, code_point_count); + return ReadonlySpan<u32>(s_emoji_code_points.data() + code_point_start, code_point_count); } @string_index_type@ name { 0 }; @@ -259,7 +259,7 @@ static constexpr Array<EmojiData, @emojis_size@> s_emojis { {)~~~"); generator.append(R"~~~( } }; -Optional<Emoji> find_emoji_for_code_points(Span<u32 const> code_points) +Optional<Emoji> find_emoji_for_code_points(ReadonlySpan<u32> code_points) { for (auto& emoji : s_emojis) { if (emoji.code_points() == code_points) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp index 8d7435486e..3fc0c74808 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp @@ -856,13 +856,13 @@ struct CodePointDecompositionRaw { struct CodePointDecomposition { u32 code_point { 0 }; CompatibilityFormattingTag tag { CompatibilityFormattingTag::Canonical }; - Span<u32 const> decomposition; + ReadonlySpan<u32> decomposition; }; Optional<Locale> locale_from_string(StringView locale); -Span<SpecialCasing const* const> special_case_mapping(u32 code_point); -Span<CaseFolding const* const> case_folding_mapping(u32 code_point); +ReadonlySpan<SpecialCasing const*> special_case_mapping(u32 code_point); +ReadonlySpan<CaseFolding const*> case_folding_mapping(u32 code_point); } )~~~"); @@ -1133,7 +1133,7 @@ static constexpr Array<CodePointRange, @size@> @name@ { { generator.set("name", collection_name); generator.set("size", DeprecatedString::number(property_names.size())); generator.append(R"~~~( -static constexpr Array<Span<CodePointRange const>, @size@> @name@ { {)~~~"); +static constexpr Array<ReadonlySpan<CodePointRange>, @size@> @name@ { {)~~~"); for (auto const& property_name : property_names) { generator.set("name", DeprecatedString::formatted(property_format, property_name)); @@ -1197,7 +1197,7 @@ Optional<StringView> code_point_block_display_name(u32 code_point) return {}; } -Span<BlockName const> block_display_names() +ReadonlySpan<BlockName> block_display_names() { static auto display_names = []() { Array<BlockName, s_block_display_names.size()> display_names; @@ -1247,7 +1247,7 @@ u32 @method@(u32 code_point) append_code_point_mapping_search("to_unicode_titlecase"sv, "s_titlecase_mappings"sv, "code_point"sv); generator.append(R"~~~( -Span<SpecialCasing const* const> special_case_mapping(u32 code_point) +ReadonlySpan<SpecialCasing const*> special_case_mapping(u32 code_point) { auto const* mapping = binary_search(s_special_case_mappings, code_point, nullptr, CodePointComparator<SpecialCaseMapping> {}); if (mapping == nullptr) @@ -1256,7 +1256,7 @@ Span<SpecialCasing const* const> special_case_mapping(u32 code_point) return mapping->special_casing.span().slice(0, mapping->special_casing_size); } -Span<CaseFolding const* const> case_folding_mapping(u32 code_point) +ReadonlySpan<CaseFolding const*> case_folding_mapping(u32 code_point) { auto const* mapping = binary_search(s_case_folding_mappings, code_point, nullptr, CodePointComparator<CaseFoldingMapping> {}); if (mapping == nullptr) @@ -1281,7 +1281,7 @@ Optional<CodePointDecomposition const> code_point_decomposition(u32 code_point) auto const* mapping = binary_search(s_decomposition_mappings, code_point, nullptr, CodePointComparator<CodePointDecompositionRaw> {}); if (mapping == nullptr) return {}; - return CodePointDecomposition { mapping->code_point, mapping->tag, Span<u32 const> { s_decomposition_mappings_data.data() + mapping->decomposition_index, mapping->decomposition_count } }; + return CodePointDecomposition { mapping->code_point, mapping->tag, ReadonlySpan<u32> { s_decomposition_mappings_data.data() + mapping->decomposition_index, mapping->decomposition_count } }; } Optional<CodePointDecomposition const> code_point_decomposition_by_index(size_t index) @@ -1289,7 +1289,7 @@ Optional<CodePointDecomposition const> code_point_decomposition_by_index(size_t if (index >= s_decomposition_mappings.size()) return {}; auto const& mapping = s_decomposition_mappings[index]; - return CodePointDecomposition { mapping.code_point, mapping.tag, Span<u32 const> { s_decomposition_mappings_data.data() + mapping.decomposition_index, mapping.decomposition_count } }; + return CodePointDecomposition { mapping.code_point, mapping.tag, ReadonlySpan<u32> { s_decomposition_mappings_data.data() + mapping.decomposition_index, mapping.decomposition_count } }; } )~~~"); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h index fa25694253..12f8e741f8 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h @@ -158,7 +158,7 @@ static constexpr Array<@type@, @size@> @name@@index@ { {)~~~"); generator.append(R"~~~( -static constexpr Array<Span<@type@ const>, @size@ + 1> @name@ { { +static constexpr Array<ReadonlySpan<@type@>, @size@ + 1> @name@ { { {})~~~"); constexpr size_t max_values_per_row = 10; @@ -475,7 +475,7 @@ Optional<@return_type@> @method_name@(StringView key) } template<typename IdentifierFormatter> -void generate_value_to_string(SourceGenerator& generator, StringView method_name_format, StringView value_type, StringView value_name, IdentifierFormatter&& format_identifier, Span<DeprecatedString const> values) +void generate_value_to_string(SourceGenerator& generator, StringView method_name_format, StringView value_type, StringView value_name, IdentifierFormatter&& format_identifier, ReadonlySpan<DeprecatedString> values) { generator.set("method_name", DeprecatedString::formatted(method_name_format, value_name)); generator.set("value_type", value_type); @@ -576,7 +576,7 @@ void generate_mapping(SourceGenerator& generator, LocalesType const& locales, St generator.set("name", name); generator.set("size", DeprecatedString::number(locales.size())); generator.append(R"~~~( -static constexpr Array<Span<@type@ const>, @size@> @name@ { { +static constexpr Array<ReadonlySpan<@type@>, @size@> @name@ { { )~~~"); constexpr size_t max_values_per_row = 10; @@ -606,7 +606,7 @@ void generate_available_values(SourceGenerator& generator, StringView name, Vect generator.set("name", name); generator.append(R"~~~( -Span<StringView const> @name@() +ReadonlySpan<StringView> @name@() { static constexpr auto values = Array {)~~~"); |