From 92fd288b072d839f376d320b18d5436464c9040c Mon Sep 17 00:00:00 2001 From: pjh456 <147148383@qq.com> Date: Mon, 12 Oct 2026 17:54:00 +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_kernel/src/builtin/bind.rs | 10 +++------- crates/oxide_kernel/tests/builtin_world_tests.rs | 2 +- crates/oxide_vm/src/async_generator.rs | 6 +++++- crates/oxide_vm/src/bindings/bind_error.rs | 2 +- crates/oxide_vm/src/bindings/bind_weak.rs | 6 +++++- crates/oxide_vm/src/generator.rs | 6 +++++- crates/oxide_vm/src/promise/constructor.rs | 6 +++++- 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/crates/oxide_kernel/src/builtin/bind.rs b/crates/oxide_kernel/src/builtin/bind.rs index 0fcee402..cd0f533b 100644 --- a/crates/oxide_kernel/src/builtin/bind.rs +++ b/crates/oxide_kernel/src/builtin/bind.rs @@ -168,12 +168,7 @@ impl BuiltinWorld { let proto_ptr = P::as_ptr(&world.error_proto) as *mut JsObject; let proto = unsafe { &mut *proto_ptr }; - bind_methods!( - env, - proto, - ("toString", methods.to_string, 0), - ("toJSON", methods.to_json, 1), - ); + bind_methods!(env, proto, ("toString", methods.to_string, 0), ("toJSON", methods.to_json, 1),); let si_name = string_forge.intern("name").0; let error_si = string_forge.intern("Error").0; @@ -357,7 +352,8 @@ impl BuiltinWorld { /// [`Self::bind_method`] 的站点标签版本：属性键由方法名 intern 得出， /// 供非 P 目标（VM 内建原型 Box 对象）的静态绑定宏使用。 pub fn bind_method_labeled_static( - env: BindEnv<'_>, proto: &mut JsObject, method_name: &str, native_fn_ptr: NativeFnPtr, arg_count: u8, label: u32, + env: BindEnv<'_>, proto: &mut JsObject, method_name: &str, native_fn_ptr: NativeFnPtr, arg_count: u8, + label: u32, ) -> Result<(), String> { let si = env.string_forge.intern(method_name).0; Self::bind_method_key_labeled_static(env, proto, si, method_name, native_fn_ptr, arg_count, label) diff --git a/crates/oxide_kernel/tests/builtin_world_tests.rs b/crates/oxide_kernel/tests/builtin_world_tests.rs index 3e7c9ed3..b5a24b2b 100644 --- a/crates/oxide_kernel/tests/builtin_world_tests.rs +++ b/crates/oxide_kernel/tests/builtin_world_tests.rs @@ -1,4 +1,4 @@ -use oxide_kernel::builtin::{BuiltinWorld, BindEnv}; +use oxide_kernel::builtin::{BindEnv, BuiltinWorld}; use oxide_kernel::kernel::BuiltinDirtySet; use oxide_kernel::shape_forge::{ShapeForge, EMPTY_SHAPE_ID}; use oxide_kernel::string_forge::PermInterner; diff --git a/crates/oxide_vm/src/async_generator.rs b/crates/oxide_vm/src/async_generator.rs index 462b8e04..f3a3c8bd 100644 --- a/crates/oxide_vm/src/async_generator.rs +++ b/crates/oxide_vm/src/async_generator.rs @@ -1713,7 +1713,11 @@ pub(crate) fn init_async_generator_intrinsics(vm: &mut Vm) { let mut ag_proto = Box::new(JsObject::new_empty(EMPTY_SHAPE_ID, async_iterator_proto_val)); // 站点标签：与 Generator 原型的同名方法槽（next/return/throw）区分复用键。 let ag_label = sf.intern("AsyncGeneratorPrototype").0; - let kenv = oxide_kernel::builtin::BindEnv { world, shape_forge: sh, string_forge: sf }; + let kenv = oxide_kernel::builtin::BindEnv { + world, + shape_forge: sh, + string_forge: sf, + }; oxide_kernel::bind_methods!( kenv, &mut ag_proto, diff --git a/crates/oxide_vm/src/bindings/bind_error.rs b/crates/oxide_vm/src/bindings/bind_error.rs index 9f746299..e970a4ff 100644 --- a/crates/oxide_vm/src/bindings/bind_error.rs +++ b/crates/oxide_vm/src/bindings/bind_error.rs @@ -3,7 +3,7 @@ use oxide_kernel::shape_forge::EMPTY_SHAPE_ID; use oxide_types::object::{JsObject, NativeFnPtr, PropAttributes}; use oxide_types::value::JsValue; -use super::{BindEnv, kernel_env}; +use super::{kernel_env, BindEnv}; fn bind_error_subtype_constructor( env: BindEnv<'_>, global: &mut JsObject, name: &str, proto_ptr: *mut JsObject, ctor_fn: *const (), arg_count: u8, diff --git a/crates/oxide_vm/src/bindings/bind_weak.rs b/crates/oxide_vm/src/bindings/bind_weak.rs index 24cca57e..491779e8 100644 --- a/crates/oxide_vm/src/bindings/bind_weak.rs +++ b/crates/oxide_vm/src/bindings/bind_weak.rs @@ -29,7 +29,11 @@ fn bind_labeled_method( // SAFETY: func 是转成 *const () 的 NativeFn 函数项指针。 let fn_ptr = unsafe { oxide_types::object::NativeFnPtr::from_raw(func) }; let _ = oxide_kernel::builtin::BuiltinWorld::bind_method_labeled_static( - oxide_kernel::builtin::BindEnv { world, shape_forge, string_forge }, + oxide_kernel::builtin::BindEnv { + world, + shape_forge, + string_forge, + }, proto, name, fn_ptr, diff --git a/crates/oxide_vm/src/generator.rs b/crates/oxide_vm/src/generator.rs index e534f658..d72b5c42 100644 --- a/crates/oxide_vm/src/generator.rs +++ b/crates/oxide_vm/src/generator.rs @@ -809,7 +809,11 @@ pub(crate) fn init_generator_intrinsics(vm: &mut Vm) { let mut gen_proto = Box::new(JsObject::new_empty(EMPTY_SHAPE_ID, iterator_proto_val)); // 站点标签：与 AsyncGenerator 原型的同名方法槽（next/return/throw）区分复用键。 let gen_label = sf.intern("GeneratorPrototype").0; - let kenv = oxide_kernel::builtin::BindEnv { world, shape_forge: sh, string_forge: sf }; + let kenv = oxide_kernel::builtin::BindEnv { + world, + shape_forge: sh, + string_forge: sf, + }; oxide_kernel::bind_methods!( kenv, &mut gen_proto, diff --git a/crates/oxide_vm/src/promise/constructor.rs b/crates/oxide_vm/src/promise/constructor.rs index 8dca2551..0e4e8480 100644 --- a/crates/oxide_vm/src/promise/constructor.rs +++ b/crates/oxide_vm/src/promise/constructor.rs @@ -272,7 +272,11 @@ impl Vm { proto.set_shape_id(ctor_shape); proto.push_prop(JsValue::undefined()); proto.set_data_meta(0u32, PropAttributes::new(true, false, true)); - let kenv = oxide_kernel::builtin::BindEnv { world, shape_forge: sh, string_forge: sf }; + let kenv = oxide_kernel::builtin::BindEnv { + world, + shape_forge: sh, + string_forge: sf, + }; oxide_kernel::bind_methods!( kenv, &mut proto,