From 7d25020ca135d62f91a5011535bbd0cc7f095f4e Mon Sep 17 00:00:00 2001 From: pjh456 <147148383@qq.com> Date: Mon, 19 Oct 2026 04:47:57 +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_test262/src/worker.rs | 6 +--- crates/oxide_vm/src/shadow_realm.rs | 43 ++++++++--------------------- 2 files changed, 13 insertions(+), 36 deletions(-) diff --git a/crates/oxide_test262/src/worker.rs b/crates/oxide_test262/src/worker.rs index 88abdc8c..d0ae82d0 100644 --- a/crates/oxide_test262/src/worker.rs +++ b/crates/oxide_test262/src/worker.rs @@ -201,11 +201,7 @@ pub(crate) fn run_worker(config: &RunConfig) -> bool { // test262 宿主约定:每测试以测试文件所在目录为工作目录(importValue // 等按相对路径解析 fixture 的 API 依赖此约定)。相对路径以初始工作 // 目录为基准转绝对:cwd 随测试切换,基准在窗口循环前固定。 - let test_path = if path.is_absolute() { - path - } else { - base_dir.join(&path) - }; + let test_path = if path.is_absolute() { path } else { base_dir.join(&path) }; if let Some(dir) = test_path.parent() { let _ = std::env::set_current_dir(dir); } diff --git a/crates/oxide_vm/src/shadow_realm.rs b/crates/oxide_vm/src/shadow_realm.rs index 7b5b5e1d..092ae429 100644 --- a/crates/oxide_vm/src/shadow_realm.rs +++ b/crates/oxide_vm/src/shadow_realm.rs @@ -118,12 +118,7 @@ pub(crate) fn evaluate(vm: &mut Vm, args: &[u8]) -> NativeResult { }; let value = match raw_result { Ok(v) => v, - Err(_) => { - return NativeResult::Err(error::create_type_error( - vm, - "Error evaluating code in ShadowRealm", - )) - } + Err(_) => return NativeResult::Err(error::create_type_error(vm, "Error evaluating code in ShadowRealm")), }; // 结果结算:GetWrappedValue(callerRealm, value)。 @@ -289,12 +284,7 @@ fn wrapped_function_call(vm: &mut Vm, args: &[u8]) -> NativeResult { }; let value = match result { Ok(v) => v, - Err(_) => { - return NativeResult::Err(error::create_type_error( - vm, - "Error calling wrapped function", - )) - } + Err(_) => return NativeResult::Err(error::create_type_error(vm, "Error calling wrapped function")), }; // 返回值结算:GetWrappedValue(callerRealm, result)。 @@ -344,9 +334,7 @@ fn resolve_vm(vm: &mut Vm, realm_id: u64) -> &mut Vm { /// - 符号:按 realm 重映射(well-known 同下标、注册表符号按 key 复用 / 新建、 /// 普通符号按描述新建)。 /// - 其余原始值:直返。 -fn settle_value( - vm: &mut Vm, wrapper_realm_id: u64, target_realm_id: u64, value: JsValue, -) -> Result { +fn settle_value(vm: &mut Vm, wrapper_realm_id: u64, target_realm_id: u64, value: JsValue) -> Result { if value.is_object() { if oxide_builtins::iterator::is_callable(value) { return settle_function(vm, wrapper_realm_id, target_realm_id, value); @@ -382,12 +370,7 @@ fn settle_function( let has_own_length = match oxide_builtins::object::own_descriptor_of(target_vm, target_obj, length_si) { Ok(Some(_)) => true, Ok(None) => false, - Err(_) => { - return Err(error::create_type_error( - vm, - "ShadowRealm: error checking function length", - )) - } + Err(_) => return Err(error::create_type_error(vm, "ShadowRealm: error checking function length")), }; let name_result = target_vm.ordinary_get(target_obj, name_si, target_fn); let length_result = if has_own_length { @@ -401,15 +384,11 @@ fn settle_function( // getter 抛错包 TypeError(规范:WrappedFunctionCreate 从调用方 realm 抛 TypeError)。 let target_name = match name_result { Ok(v) => v, - Err(_) => { - return Err(error::create_type_error(vm, "ShadowRealm: error reading function name")) - } + Err(_) => return Err(error::create_type_error(vm, "ShadowRealm: error reading function name")), }; let target_length = match length_result { Ok(v) => v, - Err(_) => { - return Err(error::create_type_error(vm, "ShadowRealm: error reading function length")) - } + Err(_) => return Err(error::create_type_error(vm, "ShadowRealm: error reading function length")), }; // 计算包装后的 name / length。 @@ -422,7 +401,11 @@ fn settle_function( // 包装侧:建 WrappedFunction。 let wrapper_vm = resolve_vm(vm, wrapper_realm_id); Ok(create_wrapped_function( - wrapper_vm, target_realm_id, keepalive_index, &wrapped_name, wrapped_length, + wrapper_vm, + target_realm_id, + keepalive_index, + &wrapped_name, + wrapped_length, )) } @@ -432,9 +415,7 @@ fn settle_function( /// 1. 目标侧:读符号描述与注册表 key。 /// 2. 包装侧:well-known 按同下标、注册表符号按 key 复用 / 新建、 /// 普通符号按描述新建(不入注册表)。 -fn settle_symbol( - vm: &mut Vm, wrapper_realm_id: u64, target_realm_id: u64, value: JsValue, -) -> Result { +fn settle_symbol(vm: &mut Vm, wrapper_realm_id: u64, target_realm_id: u64, value: JsValue) -> Result { let local_index = value.as_symbol_local_index(); // 目标侧:读符号描述与注册表 key。 let (description, registry_key) = {