style: 自动格式化

This commit is contained in:
2026-10-12 17:25:40 +00:00
parent a651cbff54
commit df599313d4
10 changed files with 23 additions and 59 deletions
+2 -6
View File
@@ -51,12 +51,8 @@ pub fn bind_array(env: BindEnv<'_>, global: &mut JsObject) {
with_method: oxide_builtins::array::array_with::<crate::vm::Vm> as *const (), with_method: oxide_builtins::array::array_with::<crate::vm::Vm> as *const (),
}; };
env.world().bind_array_methods( env.world()
&_array_methods, .bind_array_methods(&_array_methods, env.string_forge(), env.shape_forge(), env.realm_id);
env.string_forge(),
env.shape_forge(),
env.realm_id,
);
let array_proto_ptr = env.world().array_proto.as_ptr() as *mut JsObject; let array_proto_ptr = env.world().array_proto.as_ptr() as *mut JsObject;
let array_proto = unsafe { &mut *array_proto_ptr }; let array_proto = unsafe { &mut *array_proto_ptr };
@@ -170,8 +170,7 @@ pub fn sync_async_disposable_stack_ctor(env: BindEnv<'_>, global: &mut JsObject)
let Some(proto_pos) = env.shape_forge().lookup_position(ctor.shape_id(), si_prototype) else { let Some(proto_pos) = env.shape_forge().lookup_position(ctor.shape_id(), si_prototype) else {
return; return;
}; };
let new_proto = let new_proto = JsValue::from_js_object(env.world().async_disposable_stack_proto.as_ptr() as *mut JsObject);
JsValue::from_js_object(env.world().async_disposable_stack_proto.as_ptr() as *mut JsObject);
ctor.set_prop_at(proto_pos, new_proto); ctor.set_prop_at(proto_pos, new_proto);
let proto_ptr = env.world().async_disposable_stack_proto.as_ptr() as *mut JsObject; let proto_ptr = env.world().async_disposable_stack_proto.as_ptr() as *mut JsObject;
+3 -7
View File
@@ -6,8 +6,7 @@ use oxide_types::value::JsValue;
use super::BindEnv; use super::BindEnv;
fn bind_error_subtype_constructor( fn bind_error_subtype_constructor(
env: BindEnv<'_>, global: &mut JsObject, name: &str, proto_ptr: *mut JsObject, env: BindEnv<'_>, global: &mut JsObject, name: &str, proto_ptr: *mut JsObject, ctor_fn: *const (), arg_count: u8,
ctor_fn: *const (), arg_count: u8,
) { ) {
let sf = env.string_forge(); let sf = env.string_forge();
let sh = env.shape_forge(); let sh = env.shape_forge();
@@ -108,11 +107,8 @@ pub fn bind_error(env: BindEnv<'_>, global: &mut JsObject) {
is_error: oxide_builtins::error::error_is_error::<crate::vm::Vm> as *const (), is_error: oxide_builtins::error::error_is_error::<crate::vm::Vm> as *const (),
to_json: oxide_builtins::error::error_to_json::<crate::vm::Vm> as *const (), to_json: oxide_builtins::error::error_to_json::<crate::vm::Vm> as *const (),
}; };
env.world().bind_error_methods( env.world()
&error_methods, .bind_error_methods(&error_methods, env.string_forge(), env.shape_forge());
env.string_forge(),
env.shape_forge(),
);
// stack 为访问器成对安装(getter 现算栈串 / setter 走 // stack 为访问器成对安装(getter 现算栈串 / setter 走
// SetterThatIgnoresPrototypeProperties),经 getset 绑定器登记复用键, // SetterThatIgnoresPrototypeProperties),经 getset 绑定器登记复用键,
@@ -20,12 +20,8 @@ pub fn bind_function(env: BindEnv<'_>, global: &mut JsObject) {
to_string: oxide_builtins::function::function_to_string::<crate::vm::Vm> as *const (), to_string: oxide_builtins::function::function_to_string::<crate::vm::Vm> as *const (),
has_instance: oxide_builtins::function::function_symbol_has_instance::<crate::vm::Vm> as *const (), has_instance: oxide_builtins::function::function_symbol_has_instance::<crate::vm::Vm> as *const (),
}; };
env.world().bind_function_methods( env.world()
&function_methods, .bind_function_methods(&function_methods, env.string_forge(), env.shape_forge(), env.realm_id);
env.string_forge(),
env.shape_forge(),
env.realm_id,
);
let function_ctor = env.world().function_constructor.as_ptr() as *mut JsObject; let function_ctor = env.world().function_constructor.as_ptr() as *mut JsObject;
configure_native_constructor( configure_native_constructor(
+1 -2
View File
@@ -36,8 +36,7 @@ pub fn bind_object(env: BindEnv<'_>, global: &mut JsObject) {
as *const (), as *const (),
group_by: oxide_builtins::object::object_group_by::<crate::vm::Vm> as *const (), group_by: oxide_builtins::object::object_group_by::<crate::vm::Vm> as *const (),
}; };
env.world() env.world().bind_object_methods(&methods, env.string_forge(), env.shape_forge());
.bind_object_methods(&methods, env.string_forge(), env.shape_forge());
let object_proto_ptr = env.world().object_proto.as_ptr() as *mut JsObject; let object_proto_ptr = env.world().object_proto.as_ptr() as *mut JsObject;
let object_proto = unsafe { &mut *object_proto_ptr }; let object_proto = unsafe { &mut *object_proto_ptr };
+3 -8
View File
@@ -60,11 +60,8 @@ pub fn bind_string(env: BindEnv<'_>, global: &mut JsObject) {
sub: oxide_builtins::string::string_sub::<crate::vm::Vm> as *const (), sub: oxide_builtins::string::string_sub::<crate::vm::Vm> as *const (),
sup: oxide_builtins::string::string_sup::<crate::vm::Vm> as *const (), sup: oxide_builtins::string::string_sup::<crate::vm::Vm> as *const (),
}; };
env.world().bind_string_methods( env.world()
&string_methods, .bind_string_methods(&string_methods, env.string_forge(), env.shape_forge());
env.string_forge(),
env.shape_forge(),
);
let ctor_ptr = env.world().string_constructor.as_ptr() as *mut JsObject; let ctor_ptr = env.world().string_constructor.as_ptr() as *mut JsObject;
let ctor = unsafe { &mut *ctor_ptr }; let ctor = unsafe { &mut *ctor_ptr };
@@ -103,9 +100,7 @@ pub fn bind_string(env: BindEnv<'_>, global: &mut JsObject) {
if let Some(pos) = env.shape_forge().lookup_position(proto.shape_id(), iter_key) { if let Some(pos) = env.shape_forge().lookup_position(proto.shape_id(), iter_key) {
let v = proto.get_prop_at(pos); let v = proto.get_prop_at(pos);
if v.is_object() { if v.is_object() {
env.world() env.world().string_default_iterator.set(v.as_js_object_ptr() as *const JsObject);
.string_default_iterator
.set(v.as_js_object_ptr() as *const JsObject);
} }
} }
+3 -12
View File
@@ -117,10 +117,7 @@ pub fn bind_temporal(env: BindEnv<'_>, global: &mut JsObject) {
env.core, env.core,
instant_proto, instant_proto,
9, 9,
JsValue::perm_string( JsValue::perm_string(env.string_forge().string_ptr(env.string_forge().intern("Temporal.Instant").0)),
env.string_forge()
.string_ptr(env.string_forge().intern("Temporal.Instant").0),
),
PropAttributes::new(false, false, true), PropAttributes::new(false, false, true),
env.realm_id, env.realm_id,
); );
@@ -666,10 +663,7 @@ pub fn bind_temporal(env: BindEnv<'_>, global: &mut JsObject) {
env.core, env.core,
plain_time_proto, plain_time_proto,
9, 9,
JsValue::perm_string( JsValue::perm_string(env.string_forge().string_ptr(env.string_forge().intern("Temporal.PlainTime").0)),
env.string_forge()
.string_ptr(env.string_forge().intern("Temporal.PlainTime").0),
),
PropAttributes::new(false, false, true), PropAttributes::new(false, false, true),
env.realm_id, env.realm_id,
); );
@@ -911,10 +905,7 @@ pub fn bind_temporal(env: BindEnv<'_>, global: &mut JsObject) {
env.core, env.core,
duration_proto, duration_proto,
9, 9,
JsValue::perm_string( JsValue::perm_string(env.string_forge().string_ptr(env.string_forge().intern("Temporal.Duration").0)),
env.string_forge()
.string_ptr(env.string_forge().intern("Temporal.Duration").0),
),
PropAttributes::new(false, false, true), PropAttributes::new(false, false, true),
env.realm_id, env.realm_id,
); );
@@ -354,8 +354,7 @@ pub fn bind_typed_array(env: BindEnv<'_>, global: &mut JsObject) {
bind_typed_array_abstract_ctor(env); bind_typed_array_abstract_ctor(env);
// 把 `%TypedArray%` 抽象构造器暴露为全局 `TypedArray`(具体构造器的 [[Prototype]])。 // 把 `%TypedArray%` 抽象构造器暴露为全局 `TypedArray`(具体构造器的 [[Prototype]])。
let abstract_ctor_val = let abstract_ctor_val = JsValue::from_js_object(env.world().typed_array_constructor.as_ptr() as *mut JsObject);
JsValue::from_js_object(env.world().typed_array_constructor.as_ptr() as *mut JsObject);
bind_global_value(env.core, global, "TypedArray", abstract_ctor_val); bind_global_value(env.core, global, "TypedArray", abstract_ctor_val);
bind_typed_array_constructor!( bind_typed_array_constructor!(
+5 -12
View File
@@ -7,7 +7,9 @@
//! 安装(既有槽更新槽值、无槽新开)。 //! 安装(既有槽更新槽值、无槽新开)。
use crate::bind_constructor; use crate::bind_constructor;
use crate::bindings::{apply_binding_table, bind_accessor_getset, bind_accessor_getter, configure_native_constructor, BindEnv}; use crate::bindings::{
apply_binding_table, bind_accessor_getset, bind_accessor_getter, configure_native_constructor, BindEnv,
};
use oxide_kernel::shape_forge::{ShapeForge, EMPTY_SHAPE_ID}; use oxide_kernel::shape_forge::{ShapeForge, EMPTY_SHAPE_ID};
use oxide_types::object::{JsObject, PropAttributes}; use oxide_types::object::{JsObject, PropAttributes};
use oxide_types::string_forge::PermInterner; use oxide_types::string_forge::PermInterner;
@@ -165,11 +167,7 @@ pub fn bind_worker(env: BindEnv<'_>, global: &mut JsObject) {
// 幂等守卫。 // 幂等守卫。
let si_import_scripts = sf.intern("importScripts").0; let si_import_scripts = sf.intern("importScripts").0;
if sh.lookup_position(global.shape_id(), si_import_scripts).is_none() { if sh.lookup_position(global.shape_id(), si_import_scripts).is_none() {
apply_binding_table( apply_binding_table(env, global, &[("importScripts", crate::worker::bindings::import_scripts as *const (), 1)]);
env,
global,
&[("importScripts", crate::worker::bindings::import_scripts as *const (), 1)],
);
} }
// EventTarget 三方法直绑全局(worker realm 经 self === global 可达;全局原型链 // EventTarget 三方法直绑全局(worker realm 经 self === global 可达;全局原型链
// 是 Object.prototype,首版不改全局原型,三方法直绑全局等价可见)。幂等守卫。 // 是 Object.prototype,首版不改全局原型,三方法直绑全局等价可见)。幂等守卫。
@@ -241,12 +239,7 @@ pub fn bind_worker(env: BindEnv<'_>, global: &mut JsObject) {
let si_location = sf.intern("location").0; let si_location = sf.intern("location").0;
if sh.lookup_position(global.shape_id(), si_location).is_none() { if sh.lookup_position(global.shape_id(), si_location).is_none() {
if worker_realm { if worker_realm {
bind_accessor_getter( bind_accessor_getter(env, global, "location", crate::worker::bindings::self_location as *const ());
env,
global,
"location",
crate::worker::bindings::self_location as *const (),
);
} else { } else {
bind_global_empty_string_property(global, sf, sh, si_location); bind_global_empty_string_property(global, sf, sh, si_location);
} }
+2 -2
View File
@@ -285,8 +285,8 @@ pub(crate) fn bind_accessor_getter_key(
/// getter/setter 函数对象登记进 world 释放表,session 收尾时统一释放, /// getter/setter 函数对象登记进 world 释放表,session 收尾时统一释放,
/// 与 `bind_accessor_getter` 的 getter 及方法 wrapper 同一生命周期约定。 /// 与 `bind_accessor_getter` 的 getter 及方法 wrapper 同一生命周期约定。
pub(crate) fn bind_accessor_getset( pub(crate) fn bind_accessor_getset(
env: BindEnv<'_>, proto: &mut JsObject, key: u32, getter_name: &str, setter_name: &str, env: BindEnv<'_>, proto: &mut JsObject, key: u32, getter_name: &str, setter_name: &str, getter_fn: *const (),
getter_fn: *const (), setter_fn: *const (), setter_fn: *const (),
) { ) {
let shape_forge = env.shape_forge(); let shape_forge = env.shape_forge();
let string_forge = env.string_forge(); let string_forge = env.string_forge();