From d326521d5f4b186028c04ebd18e88281b76120b1 Mon Sep 17 00:00:00 2001 From: pjh456 <147148383@qq.com> Date: Sat, 10 Oct 2026 16:32: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 --- crates/oxide_vm/src/bindings/bind_event.rs | 5 ++++- crates/oxide_vm/src/worker/mod.rs | 12 ++---------- crates/oxide_vm/tests/event_target_tests.rs | 9 ++------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/crates/oxide_vm/src/bindings/bind_event.rs b/crates/oxide_vm/src/bindings/bind_event.rs index c37a74b5..3e321dbd 100644 --- a/crates/oxide_vm/src/bindings/bind_event.rs +++ b/crates/oxide_vm/src/bindings/bind_event.rs @@ -299,7 +299,10 @@ pub fn bind_event(core: &Arc, session: &KernelSession, global: &mut let ee_getter_fns: [(&str, *const ()); 5] = [ ("message", oxide_builtins::event::error_event_message_getter:: as *const ()), - ("filename", oxide_builtins::event::error_event_filename_getter:: as *const ()), + ( + "filename", + oxide_builtins::event::error_event_filename_getter:: as *const (), + ), ("lineno", oxide_builtins::event::error_event_lineno_getter:: as *const ()), ("colno", oxide_builtins::event::error_event_colno_getter:: as *const ()), ("error", oxide_builtins::event::error_event_error_getter:: as *const ()), diff --git a/crates/oxide_vm/src/worker/mod.rs b/crates/oxide_vm/src/worker/mod.rs index 5c236629..8cd4690d 100644 --- a/crates/oxide_vm/src/worker/mod.rs +++ b/crates/oxide_vm/src/worker/mod.rs @@ -858,16 +858,8 @@ mod tests { } std::thread::sleep(Duration::from_millis(10)); } - assert_eq!( - global_value_opt(&vm, "isEE"), - Some(JsValue::bool(true)), - "事件应 instanceof ErrorEvent" - ); - assert_eq!( - global_value_opt(&vm, "isE"), - Some(JsValue::bool(true)), - "事件应 instanceof Event" - ); + assert_eq!(global_value_opt(&vm, "isEE"), Some(JsValue::bool(true)), "事件应 instanceof ErrorEvent"); + assert_eq!(global_value_opt(&vm, "isE"), Some(JsValue::bool(true)), "事件应 instanceof Event"); vm.shutdown_workers(); let _ = std::fs::remove_file(&worker_path); diff --git a/crates/oxide_vm/tests/event_target_tests.rs b/crates/oxide_vm/tests/event_target_tests.rs index d0015f12..d6f770fd 100644 --- a/crates/oxide_vm/tests/event_target_tests.rs +++ b/crates/oxide_vm/tests/event_target_tests.rs @@ -241,10 +241,7 @@ fn registry_pruned_after_target_collected() { /// ErrorEvent 构造器:init 的 message 经原型 getter 可读。 #[test] fn error_event_constructor_message() { - assert_eq!( - eval("new ErrorEvent('error', { message: 'boom' }).message;"), - "boom" - ); + assert_eq!(eval("new ErrorEvent('error', { message: 'boom' }).message;"), "boom"); } /// ErrorEvent 缺省字段:message 空串、filename 空串、lineno 与 colno 为 0、 @@ -287,9 +284,7 @@ fn error_event_requires_new() { /// ErrorEvent 盒边 GC 保活:error 字段引用对象经完整收集后仍存活。 #[test] fn error_event_box_edge_survives_gc() { - let mut vm = vm_with_script( - "globalThis.e = new ErrorEvent('error', { error: { tag: 1 } });", - ); + let mut vm = vm_with_script("globalThis.e = new ErrorEvent('error', { error: { tag: 1 } });"); // 强制完整收集:error 字段是盒内 GC 边,对象应保活。 vm.collect_session_gc(); assert_eq!(vm_eval(&mut vm, "globalThis.e.error.tag;"), "1");