From 2f1184ccdbb207cb273b75bff9361a4f50674425 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Thu, 19 Jan 2023 11:40:17 -0500 Subject: [PATCH] LibJS: Do not fully qualify references to CanonicalizeUnicodeLocaleId This might've been needed at some point to disambiguate between another function of the same name that is in LibLocale. But now that it takes a VM parameter, it is for sure clear to the compiler what is being called. --- Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp | 4 ++-- Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.cpp | 2 +- Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp b/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp index b80e259a4f..fbc8816be1 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp @@ -250,7 +250,7 @@ ThrowCompletionOr> canonicalize_locale_list(VM& vm, Val // vi. Let canonicalizedTag be ! CanonicalizeUnicodeLocaleId(tag). // NOTE: We TRY this operation only to propagate OOM errors. - auto canonicalized_tag = TRY(JS::Intl::canonicalize_unicode_locale_id(vm, *locale_id)); + auto canonicalized_tag = TRY(canonicalize_unicode_locale_id(vm, *locale_id)); // vii. If canonicalizedTag is not an element of seen, append canonicalizedTag as the last element of seen. if (!seen.contains_slow(canonicalized_tag)) @@ -353,7 +353,7 @@ ThrowCompletionOr insert_unicode_extension_and_canonicalize(VM // of that string. LibUnicode gives us the parsed locale in a structure, so we can mutate that // structure directly. TRY_OR_THROW_OOM(vm, locale.extensions.try_append(move(extension))); - return TRY(JS::Intl::canonicalize_unicode_locale_id(vm, locale)); + return TRY(canonicalize_unicode_locale_id(vm, locale)); } template diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.cpp b/Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.cpp index 4ba3cad2dc..14dddfdc36 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/DisplayNames.cpp @@ -116,7 +116,7 @@ ThrowCompletionOr canonical_code_for_display_names(VM& vm, DisplayNames:: // c. Return ! CanonicalizeUnicodeLocaleId(code). // NOTE: We TRY this operation only to propagate OOM errors. - auto canonicalized_tag = TRY(JS::Intl::canonicalize_unicode_locale_id(vm, *locale_id)); + auto canonicalized_tag = TRY(canonicalize_unicode_locale_id(vm, *locale_id)); return PrimitiveString::create(vm, move(canonicalized_tag)); } diff --git a/Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp b/Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp index f28b49130a..fe5a7492a4 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/LocaleConstructor.cpp @@ -68,7 +68,7 @@ static ThrowCompletionOr apply_options_to_tag(VM& vm, StringVi // 10. Set tag to ! CanonicalizeUnicodeLocaleId(tag). // NOTE: We TRY this operation only to propagate OOM errors. - auto canonicalized_tag = TRY(JS::Intl::canonicalize_unicode_locale_id(vm, *locale_id)); + auto canonicalized_tag = TRY(canonicalize_unicode_locale_id(vm, *locale_id)); // 11. Assert: tag matches the unicode_locale_id production. locale_id = TRY_OR_THROW_OOM(vm, ::Locale::parse_unicode_locale_id(canonicalized_tag)); @@ -103,7 +103,7 @@ static ThrowCompletionOr apply_options_to_tag(VM& vm, StringVi // 16. Set tag to tag with the substring corresponding to the unicode_language_id production replaced by the string languageId. // 17. Return ! CanonicalizeUnicodeLocaleId(tag). - return JS::Intl::canonicalize_unicode_locale_id(vm, *locale_id); + return canonicalize_unicode_locale_id(vm, *locale_id); } // 14.1.3 ApplyUnicodeExtensionToTag ( tag, options, relevantExtensionKeys ), https://tc39.es/ecma402/#sec-apply-unicode-extension-to-tag