Fix CI: remove expectedFailure for passing peepholer tests, rustfmt

youknowone · youknowone · commit 1bc3b123c71b · 2026-03-29T10:47:10.000+09:00
- test_while_one: now passes with constant condition elimination
- test_elim_jump_to_uncond_jump: now passes with JUMP→RETURN inlining
- Apply rustfmt to ir.rs, frame.rs, compile.rs
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
@@ -132,7 +132,6 @@ def f():
         self.assertInBytecode(f, 'LOAD_CONST', None)
         self.check_lnotab(f)
 
-    @unittest.expectedFailure  # TODO: RUSTPYTHON; RETURN_VALUE
     def test_while_one(self):
         # Skip over:  LOAD_CONST trueconst  POP_JUMP_IF_FALSE xx
         def f():
@@ -545,7 +544,6 @@ def f(cond, true_value, false_value):
         self.assertEqual(len(returns), 2)
         self.check_lnotab(f)
 
-    @unittest.expectedFailure  # TODO: RUSTPYTHON; absolute jump encoding
     def test_elim_jump_to_uncond_jump(self):
         # POP_JUMP_IF_FALSE to JUMP_FORWARD --> POP_JUMP_IF_FALSE to non-jump
         def f():
diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs
@@ -7278,7 +7278,11 @@ impl Compiler {
                     (n_big_chunks, remainder)
                 } else {
                     // remainder is 0 or >15: all chunks are MAP_ADD chunks
-                    let total_map_add = if remainder == 0 { n_big_chunks } else { n_big_chunks + 1 };
+                    let total_map_add = if remainder == 0 {
+                        n_big_chunks
+                    } else {
+                        n_big_chunks + 1
+                    };
                     (total_map_add, 0usize)
                 };
 
diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs
@@ -458,8 +458,10 @@ impl CodeInfo {
                     let cache_count = info.cache_entries as usize;
                     let (extras, lo_arg) = info.arg.split();
                     let loc_pair = (info.location, info.end_location);
-                    locations
-                        .extend(core::iter::repeat_n(loc_pair, info.arg.instr_size() + cache_count));
+                    locations.extend(core::iter::repeat_n(
+                        loc_pair,
+                        info.arg.instr_size() + cache_count,
+                    ));
                     // Collect linetable locations with lineno_override support
                     let lt_loc = LineTableLocation {
                         line: info
diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs
@@ -9450,9 +9450,9 @@ impl ExecutingFrame<'_> {
                 // Returns the exception object; RERAISE will re-raise it
                 if arg.fast_isinstance(vm.ctx.exceptions.stop_iteration) {
                     let flags = &self.code.flags;
-                    let msg = if flags.contains(
-                        bytecode::CodeFlags::COROUTINE | bytecode::CodeFlags::GENERATOR,
-                    ) {
+                    let msg = if flags
+                        .contains(bytecode::CodeFlags::COROUTINE | bytecode::CodeFlags::GENERATOR)
+                    {
                         "async generator raised StopIteration"
                     } else if flags.contains(bytecode::CodeFlags::COROUTINE) {
                         "coroutine raised StopIteration"
