diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp index 5a61f23d3f..18c9bb72a5 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp @@ -132,8 +132,8 @@ ThrowCompletionOr calendar_merge_fields(GlobalObject& global_object, Ob // 2. If mergeFields is undefined, then if (!merge_fields) { - // a. Return ? DefaultMergeFields(fields, additionalFields). - return TRY(default_merge_fields(global_object, fields, additional_fields)); + // a. Return ? DefaultMergeCalendarFields(fields, additionalFields). + return TRY(default_merge_calendar_fields(global_object, fields, additional_fields)); } // 3. Let result be ? Call(mergeFields, calendar, « fields, additionalFields »). @@ -910,8 +910,8 @@ u8 iso_day(Object& temporal_object) VERIFY_NOT_REACHED(); } -// 12.2.40 DefaultMergeFields ( fields, additionalFields ), https://tc39.es/proposal-temporal/#sec-temporal-defaultmergefields -ThrowCompletionOr default_merge_fields(GlobalObject& global_object, Object const& fields, Object const& additional_fields) +// 12.2.40 DefaultMergeCalendarFields ( fields, additionalFields ), https://tc39.es/proposal-temporal/#sec-temporal-defaultmergecalendarfields +ThrowCompletionOr default_merge_calendar_fields(GlobalObject& global_object, Object const& fields, Object const& additional_fields) { auto& vm = global_object.vm(); diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h index d5e40139fc..bada3ded72 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.h @@ -73,6 +73,6 @@ i32 iso_year(Object& temporal_object); u8 iso_month(Object& temporal_object); String iso_month_code(Object& temporal_object); u8 iso_day(Object& temporal_object); -ThrowCompletionOr default_merge_fields(GlobalObject&, Object const& fields, Object const& additional_fields); +ThrowCompletionOr default_merge_calendar_fields(GlobalObject&, Object const& fields, Object const& additional_fields); } diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/CalendarPrototype.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/CalendarPrototype.cpp index 79b1ae1b90..9171a48cef 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/CalendarPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/CalendarPrototype.cpp @@ -577,8 +577,8 @@ JS_DEFINE_NATIVE_FUNCTION(CalendarPrototype::merge_fields) // 5. Set additionalFields to ? ToObject(additionalFields). auto* additional_fields = TRY(vm.argument(1).to_object(global_object)); - // 6. Return ? DefaultMergeFields(fields, additionalFields). - return TRY(default_merge_fields(global_object, *fields, *additional_fields)); + // 6. Return ? DefaultMergeCalendarFields(fields, additionalFields). + return TRY(default_merge_calendar_fields(global_object, *fields, *additional_fields)); } // 12.4.23 Temporal.Calendar.prototype.toString ( ), https://tc39.es/proposal-temporal/#sec-temporal.calendar.prototype.tostring