From 68df9e4dfb3da6c7cb61e5d58a40b97913699d85 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Fri, 22 Oct 2021 22:45:54 +0100 Subject: [PATCH] LibJS: Convert Intl.getCanonicalLocales() function to ThrowCompletionOr --- Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp | 6 +++--- Userland/Libraries/LibJS/Runtime/Intl/Intl.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp b/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp index 7550dbcdde..03cd016955 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp +++ b/Userland/Libraries/LibJS/Runtime/Intl/Intl.cpp @@ -36,16 +36,16 @@ void Intl::initialize(GlobalObject& global_object) define_direct_property(vm.names.Locale, global_object.intl_locale_constructor(), attr); define_direct_property(vm.names.NumberFormat, global_object.intl_number_format_constructor(), attr); - define_old_native_function(vm.names.getCanonicalLocales, get_canonical_locales, 1, attr); + define_native_function(vm.names.getCanonicalLocales, get_canonical_locales, 1, attr); } // 8.3.1 Intl.getCanonicalLocales ( locales ), https://tc39.es/ecma402/#sec-intl.getcanonicallocales -JS_DEFINE_OLD_NATIVE_FUNCTION(Intl::get_canonical_locales) +JS_DEFINE_NATIVE_FUNCTION(Intl::get_canonical_locales) { auto locales = vm.argument(0); // 1. Let ll be ? CanonicalizeLocaleList(locales). - auto locale_list = TRY_OR_DISCARD(canonicalize_locale_list(global_object, locales)); + auto locale_list = TRY(canonicalize_locale_list(global_object, locales)); MarkedValueList marked_locale_list { vm.heap() }; marked_locale_list.ensure_capacity(locale_list.size()); diff --git a/Userland/Libraries/LibJS/Runtime/Intl/Intl.h b/Userland/Libraries/LibJS/Runtime/Intl/Intl.h index 731a4d84e1..fa1f69673e 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/Intl.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/Intl.h @@ -19,7 +19,7 @@ public: virtual ~Intl() override = default; private: - JS_DECLARE_OLD_NATIVE_FUNCTION(get_canonical_locales); + JS_DECLARE_NATIVE_FUNCTION(get_canonical_locales); }; }