From bbd6c6396d3103202b9242e7b7d04270408546e0 Mon Sep 17 00:00:00 2001 From: pjh456 <147148383@qq.com> Date: Sat, 6 Jun 2026 19:05:36 +0800 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_compiler/src/counter.rs | 8 ++++---- crates/oxide_compiler/src/emitter.rs | 4 +++- .../tests/compile_stmt_tests.rs | 10 ++++++++-- crates/oxide_test262/src/main.rs | 11 +++++----- crates/oxide_vm/src/vm.rs | 3 +-- crates/oxide_vm/tests/control_flow_tests.rs | 20 ++++--------------- 6 files changed, 26 insertions(+), 30 deletions(-) diff --git a/crates/oxide_compiler/src/counter.rs b/crates/oxide_compiler/src/counter.rs index f4a6e904..e66e27ca 100644 --- a/crates/oxide_compiler/src/counter.rs +++ b/crates/oxide_compiler/src/counter.rs @@ -121,10 +121,10 @@ impl Compiler { ctx.projected_pc += 1; // STORE_VAR (value from FOR_IN_NEXT) } } - oxide_parser::ForStatementLeft::AssignmentTargetIdentifier(_) => { - ctx.alloc_reg(); // key register - ctx.projected_pc += 1; // STORE_VAR - } + oxide_parser::ForStatementLeft::AssignmentTargetIdentifier(_) => { + ctx.alloc_reg(); // key register + ctx.projected_pc += 1; // STORE_VAR + } _ => {} } diff --git a/crates/oxide_compiler/src/emitter.rs b/crates/oxide_compiler/src/emitter.rs index 61fc8af1..732886a0 100644 --- a/crates/oxide_compiler/src/emitter.rs +++ b/crates/oxide_compiler/src/emitter.rs @@ -306,7 +306,9 @@ impl Compiler { let break_label = if let Some(sw_label) = ctx.current_switch() { *sw_label } else { - let (bl, _) = ctx.current_loop().ok_or("break outside switch or loop".to_string())?; + let (bl, _) = ctx + .current_loop() + .ok_or("break outside switch or loop".to_string())?; *bl }; let break_pos = ctx.resolve_label(break_label)?; diff --git a/crates/oxide_compiler/tests/compile_stmt_tests.rs b/crates/oxide_compiler/tests/compile_stmt_tests.rs index f6f73f55..bd93d593 100644 --- a/crates/oxide_compiler/tests/compile_stmt_tests.rs +++ b/crates/oxide_compiler/tests/compile_stmt_tests.rs @@ -204,7 +204,10 @@ fn compile_do_while_emits_body_before_test() { #[test] fn compile_do_while_break() { let module = compile_source("do { break; } while (true)"); - assert!(!module.bytecode.is_empty(), "do-while with break should compile"); + assert!( + !module.bytecode.is_empty(), + "do-while with break should compile" + ); } #[test] @@ -251,7 +254,10 @@ fn compile_for_in_let_decl() { fn compile_switch_emits_jmp_if_true() { let module = compile_source("var x=0; switch(x){case 1:1;case 2:2;}"); assert!( - module.bytecode.iter().any(|&i| opcode::opcode(i) == OpCode::JMP_IF_TRUE), + module + .bytecode + .iter() + .any(|&i| opcode::opcode(i) == OpCode::JMP_IF_TRUE), "switch should emit JMP_IF_TRUE" ); } diff --git a/crates/oxide_test262/src/main.rs b/crates/oxide_test262/src/main.rs index 2a66acae..aec7f181 100644 --- a/crates/oxide_test262/src/main.rs +++ b/crates/oxide_test262/src/main.rs @@ -186,7 +186,11 @@ fn run_test(path: &Path, source: &str, meta: &TestMeta) -> TestResult { Ok(r) => r, Err(_panic) => { let dur = start.elapsed().as_millis() as u64; - TestResult::fail(path.to_path_buf(), dur, "engine panic (unsupported feature)") + TestResult::fail( + path.to_path_buf(), + dur, + "engine panic (unsupported feature)", + ) } } } @@ -350,10 +354,7 @@ fn main() { let source = match std::fs::read_to_string(path) { Ok(s) => s, Err(e) => { - results.push(TestResult::skip( - path.clone(), - format!("read error: {e}"), - )); + results.push(TestResult::skip(path.clone(), format!("read error: {e}"))); stats.skip += 1; continue; } diff --git a/crates/oxide_vm/src/vm.rs b/crates/oxide_vm/src/vm.rs index 00eb39c7..750a6783 100644 --- a/crates/oxide_vm/src/vm.rs +++ b/crates/oxide_vm/src/vm.rs @@ -583,8 +583,7 @@ impl Vm { let obj = unsafe { &*obj_val.as_js_object_ptr() }; let shape_id = obj.shape_id(); - let mut keys_vec = - bumpalo::collections::Vec::new_in(self.epoch.bump()); + let mut keys_vec = bumpalo::collections::Vec::new_in(self.epoch.bump()); let mut cursor = Some(shape_id); while let Some(id) = cursor { if id == oxide_kernel::shape_forge::EMPTY_SHAPE_ID { diff --git a/crates/oxide_vm/tests/control_flow_tests.rs b/crates/oxide_vm/tests/control_flow_tests.rs index 7132a642..6a426f81 100644 --- a/crates/oxide_vm/tests/control_flow_tests.rs +++ b/crates/oxide_vm/tests/control_flow_tests.rs @@ -171,10 +171,7 @@ fn eval_do_while_continue() { #[test] fn eval_for_in_enumerates_keys() { - assert_eq!( - eval("var n=0; for (k in {a:1,b:2}) { n=n+1; } n"), - "2" - ); + assert_eq!(eval("var n=0; for (k in {a:1,b:2}) { n=n+1; } n"), "2"); } #[test] @@ -231,26 +228,17 @@ fn eval_switch_basic_match() { #[test] fn eval_switch_fallthrough() { - assert_eq!( - eval("var x=0;switch(1){case 1:case 2:x=42;}x"), - "42" - ); + assert_eq!(eval("var x=0;switch(1){case 1:case 2:x=42;}x"), "42"); } #[test] fn eval_switch_default() { - assert_eq!( - eval("var x=0;switch(99){case 1:x=10;default:x=30;}x"), - "30" - ); + assert_eq!(eval("var x=0;switch(99){case 1:x=10;default:x=30;}x"), "30"); } #[test] fn eval_switch_no_match_no_default() { - assert_eq!( - eval("var x=0;switch(99){case 1:x=10;}x"), - "0" - ); + assert_eq!(eval("var x=0;switch(99){case 1:x=10;}x"), "0"); } #[test]