From bb0362ec3be888a4a757a8a62e0ab9131e2820f5 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Thu, 26 Jan 2023 16:12:06 +0000 Subject: [PATCH] LibJS: Port builtin_time_zone_get_offset_string_for() to String --- Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.cpp | 4 ++-- Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.h | 2 +- .../LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.cpp index 90678659a2..7f147a4127 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.cpp @@ -394,13 +394,13 @@ ThrowCompletionOr get_offset_nanoseconds_for(VM& vm, Value time_zone, In } // 11.6.9 BuiltinTimeZoneGetOffsetStringFor ( timeZone, instant ), https://tc39.es/proposal-temporal/#sec-temporal-builtintimezonegetoffsetstringfor -ThrowCompletionOr builtin_time_zone_get_offset_string_for(VM& vm, Value time_zone, Instant& instant) +ThrowCompletionOr builtin_time_zone_get_offset_string_for(VM& vm, Value time_zone, Instant& instant) { // 1. Let offsetNanoseconds be ? GetOffsetNanosecondsFor(timeZone, instant). auto offset_nanoseconds = TRY(get_offset_nanoseconds_for(vm, time_zone, instant)); // 2. Return ! FormatTimeZoneOffsetString(offsetNanoseconds). - return MUST_OR_THROW_OOM(format_time_zone_offset_string(vm, offset_nanoseconds)).to_deprecated_string(); + return MUST_OR_THROW_OOM(format_time_zone_offset_string(vm, offset_nanoseconds)); } // 11.6.10 BuiltinTimeZoneGetPlainDateTimeFor ( timeZone, instant, calendar ), https://tc39.es/proposal-temporal/#sec-temporal-builtintimezonegetplaindatetimefor diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.h b/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.h index 51eb689857..25f0cf7803 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.h @@ -46,7 +46,7 @@ ThrowCompletionOr format_time_zone_offset_string(VM&, double offset_nano ThrowCompletionOr format_iso_time_zone_offset_string(VM&, double offset_nanoseconds); ThrowCompletionOr to_temporal_time_zone(VM&, Value temporal_time_zone_like); ThrowCompletionOr get_offset_nanoseconds_for(VM&, Value time_zone, Instant&); -ThrowCompletionOr builtin_time_zone_get_offset_string_for(VM&, Value time_zone, Instant&); +ThrowCompletionOr builtin_time_zone_get_offset_string_for(VM&, Value time_zone, Instant&); ThrowCompletionOr builtin_time_zone_get_plain_date_time_for(VM&, Value time_zone, Instant&, Object& calendar); ThrowCompletionOr builtin_time_zone_get_instant_for(VM&, Value time_zone, PlainDateTime&, StringView disambiguation); ThrowCompletionOr disambiguate_possible_instants(VM&, MarkedVector const& possible_instants, Value time_zone, PlainDateTime&, StringView disambiguation); diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp index 79478022e0..f9e48005d6 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/ZonedDateTimePrototype.cpp @@ -1369,7 +1369,7 @@ JS_DEFINE_NATIVE_FUNCTION(ZonedDateTimePrototype::get_iso_fields) MUST(fields->create_data_property_or_throw(vm.names.isoYear, Value(date_time->iso_year()))); // 19. Perform ! CreateDataPropertyOrThrow(fields, "offset", offset). - MUST(fields->create_data_property_or_throw(vm.names.offset, PrimitiveString::create(vm, offset))); + MUST(fields->create_data_property_or_throw(vm.names.offset, PrimitiveString::create(vm, move(offset)))); // 20. Perform ! CreateDataPropertyOrThrow(fields, "timeZone", timeZone). MUST(fields->create_data_property_or_throw(vm.names.timeZone, Value(&time_zone)));