From bbf524375e58e1c90804e79e4594ab1852b790c0 Mon Sep 17 00:00:00 2001 From: pjh456 <147148383@qq.com> Date: Wed, 14 Oct 2026 10:14:58 +0000 Subject: [PATCH] =?UTF-8?q?style:=20=E8=87=AA=E5=8A=A8=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oxide_builtins/src/temporal/plain_time.rs | 3 +-- .../src/temporal/plain_year_month.rs | 9 +++---- .../src/temporal/zoned_date_time.rs | 3 +-- crates/oxide_vm/src/bindings/bind_temporal.rs | 12 ++------- .../oxide_vm/tests/builtins_temporal_tests.rs | 26 +++++++++---------- 5 files changed, 20 insertions(+), 33 deletions(-) diff --git a/crates/oxide_builtins/src/temporal/plain_time.rs b/crates/oxide_builtins/src/temporal/plain_time.rs index 8002f277..49c034ac 100644 --- a/crates/oxide_builtins/src/temporal/plain_time.rs +++ b/crates/oxide_builtins/src/temporal/plain_time.rs @@ -10,8 +10,7 @@ use super::{ initialize_temporal_receiver, instant_rounding_mode, instant_string_without_annotations, is_ctor_call, make_plain_time, parse_any_offset_seconds, parse_difference_settings, parse_fractional_second_digits, parse_iso_date, parse_round_options, receiver_obj, reject_partial_object_with_calendar_or_time_zone, - round_instant_ns, - temporal_number_component, temporal_option_number, temporal_option_string, temporal_option_value, + round_instant_ns, temporal_number_component, temporal_option_number, temporal_option_string, temporal_option_value, temporal_overflow, valid_offset_fraction, zoned_date_time_plain_parts, FractionalSecondDigitsInput, IsoDateTime, }; diff --git a/crates/oxide_builtins/src/temporal/plain_year_month.rs b/crates/oxide_builtins/src/temporal/plain_year_month.rs index 81d6fe3d..c48817e3 100644 --- a/crates/oxide_builtins/src/temporal/plain_year_month.rs +++ b/crates/oxide_builtins/src/temporal/plain_year_month.rs @@ -10,11 +10,10 @@ use super::{ ensure_plain_year_month, format_iso_year, get_calendar_id, get_double_prop, initialize_temporal_receiver, is_ctor_call, is_leap_year_iso, iso_year_month_within_limits, make_duration, make_plain_date, make_plain_year_month, month_day_bag_calendar_id, native_engine_error, parse_round_options, - parse_year_month_difference_settings, read_iso2, receiver_obj, - reject_partial_object_with_calendar_or_time_zone, round_instant_ns, temporal_constructor_calendar_id, - temporal_number_component, temporal_option_string, temporal_option_value, temporal_overflow, - temporal_to_show_calendar, validate_month_day_annotation_suffix, validate_month_day_time_suffix, IsoDateTime, - ShowCalendar, MAX_ISO_DAY, + parse_year_month_difference_settings, read_iso2, receiver_obj, reject_partial_object_with_calendar_or_time_zone, + round_instant_ns, temporal_constructor_calendar_id, temporal_number_component, temporal_option_string, + temporal_option_value, temporal_overflow, temporal_to_show_calendar, validate_month_day_annotation_suffix, + validate_month_day_time_suffix, IsoDateTime, ShowCalendar, MAX_ISO_DAY, }; /// 读 PlainYearMonth 的 年/月/参考日 三元组（槽 0-2），含 receiver 校验。 diff --git a/crates/oxide_builtins/src/temporal/zoned_date_time.rs b/crates/oxide_builtins/src/temporal/zoned_date_time.rs index 491fff88..467d074b 100644 --- a/crates/oxide_builtins/src/temporal/zoned_date_time.rs +++ b/crates/oxide_builtins/src/temporal/zoned_date_time.rs @@ -12,8 +12,7 @@ use super::common::{ format_iso_year, format_offset_seconds_text, get_calendar_id, get_double_prop, get_instant_epoch_ns, initialize_temporal_receiver, is_ctor_call, local_to_epoch_ns, make_instant, make_zoned_date_time, parse_digits, parse_fractional_second_digits, parse_round_options, parse_temporal_string_impl, plain_date_time_object_parts, - receiver_obj, - reject_partial_object_with_calendar_or_time_zone, temporal_calendar_id, temporal_calendar_id_strict, + receiver_obj, reject_partial_object_with_calendar_or_time_zone, temporal_calendar_id, temporal_calendar_id_strict, temporal_option_number, temporal_option_string, temporal_option_value, temporal_overflow, temporal_string_strict, zoned_date_time_plain_parts, FractionalSecondDigitsInput, MAX_INSTANT_NS, }; diff --git a/crates/oxide_vm/src/bindings/bind_temporal.rs b/crates/oxide_vm/src/bindings/bind_temporal.rs index 46aeb271..6a89e1ce 100644 --- a/crates/oxide_vm/src/bindings/bind_temporal.rs +++ b/crates/oxide_vm/src/bindings/bind_temporal.rs @@ -845,11 +845,7 @@ pub fn bind_temporal(env: BindEnv<'_>, global: &mut JsObject) { oxide_builtins::temporal::plain_date_time_with_plain_time:: as *const (), 0, ), - ( - "round", - oxide_builtins::temporal::plain_date_time_round:: as *const (), - 1, - ), + ("round", oxide_builtins::temporal::plain_date_time_round:: as *const (), 1), ], ); bind_well_known_data_property( @@ -1145,11 +1141,7 @@ pub fn bind_temporal(env: BindEnv<'_>, global: &mut JsObject) { ), ("until", oxide_builtins::temporal::plain_year_month_until:: as *const (), 1), ("since", oxide_builtins::temporal::plain_year_month_since:: as *const (), 1), - ( - "round", - oxide_builtins::temporal::plain_year_month_round:: as *const (), - 1, - ), + ("round", oxide_builtins::temporal::plain_year_month_round:: as *const (), 1), ], ); bind_well_known_data_property( diff --git a/crates/oxide_vm/tests/builtins_temporal_tests.rs b/crates/oxide_vm/tests/builtins_temporal_tests.rs index f2732f9f..ab1cb2d7 100644 --- a/crates/oxide_vm/tests/builtins_temporal_tests.rs +++ b/crates/oxide_vm/tests/builtins_temporal_tests.rs @@ -4386,12 +4386,18 @@ fn plain_date_round_calendar_units() { fn plain_date_round_errors_and_calendar() { let mut vm = Vm::new(); // 缺参 / undefined → TypeError（roundTo 非串非对象）。 - let r = eval(&mut vm, "try { new Temporal.PlainDate(1976, 11, 18).round() } catch (e) { e.constructor.name }") - .unwrap(); + let r = eval( + &mut vm, + "try { new Temporal.PlainDate(1976, 11, 18).round() } catch (e) { e.constructor.name }", + ) + .unwrap(); assert_eq!(str_val(&vm, r), "TypeError"); // 对象缺 smallestUnit → RangeError。 - let r = eval(&mut vm, "try { new Temporal.PlainDate(1976, 11, 18).round({}) } catch (e) { e.constructor.name }") - .unwrap(); + let r = eval( + &mut vm, + "try { new Temporal.PlainDate(1976, 11, 18).round({}) } catch (e) { e.constructor.name }", + ) + .unwrap(); assert_eq!(str_val(&vm, r), "RangeError"); // 非法最小单位（PD 限 year/month/week/day）→ RangeError。 let r = eval( @@ -4408,11 +4414,7 @@ fn plain_date_round_errors_and_calendar() { .unwrap(); assert_eq!(str_val(&vm, r), "RangeError"); // 日历槽继承 receiver。 - let r = eval( - &mut vm, - "new Temporal.PlainDate(1976, 11, 18, 'hebrew').round('month').calendarId", - ) - .unwrap(); + let r = eval(&mut vm, "new Temporal.PlainDate(1976, 11, 18, 'hebrew').round('month').calendarId").unwrap(); assert_eq!(str_val(&vm, r), "hebrew"); } @@ -4573,11 +4575,7 @@ fn plain_year_month_round_errors_and_calendar() { .unwrap(); assert_eq!(str_val(&vm, r), "RangeError"); // 日历槽继承 receiver。 - let r = eval( - &mut vm, - "new Temporal.PlainYearMonth(1976, 11, 'hebrew').round('year').calendarId", - ) - .unwrap(); + let r = eval(&mut vm, "new Temporal.PlainYearMonth(1976, 11, 'hebrew').round('year').calendarId").unwrap(); assert_eq!(str_val(&vm, r), "hebrew"); }