RustPython
diff --git a/‎Lib/test/test_code.py‎
Lines changed: 0 additions & 6 deletions b/‎Lib/test/test_code.py‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎Lib/test/test_funcattrs.py‎
Lines changed: 0 additions & 2 deletions b/‎Lib/test/test_funcattrs.py‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎compiler/core/src/marshal.rs‎
Lines changed: 14 additions & 8 deletions b/‎compiler/core/src/marshal.rs‎
Lines changed: 14 additions & 8 deletions
@@ -222,8 +222,6 @@ class List(list):
         obj = List([1, 2, 3])
         self.assertEqual(obj[0], "Foreign getitem: 1")
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_constructor(self):
         def func(): pass
         co = func.__code__
@@ -255,8 +253,6 @@ def test_qualname(self):
             CodeTest.test_qualname.__qualname__
         )
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_replace(self):
         def func():
             x = 1
@@ -297,8 +293,6 @@ def func2():
         self.assertEqual(new_code.co_varnames, code2.co_varnames)
         self.assertEqual(new_code.co_nlocals, code2.co_nlocals)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_nlocals_mismatch(self):
         def func():
             x = 1
 
@@ -65,8 +65,6 @@ def duplicate():
             return 3
         self.assertNotEqual(self.b, duplicate)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_copying___code__(self):
         def test(): pass
         self.assertEqual(test(), None)
 
@@ -165,6 +165,19 @@ impl<'a> ReadBorrowed<'a> for &'a [u8] {
     }
 }
 
+/// Parses bytecode bytes into CodeUnit instructions.
+/// Each instruction is 2 bytes: opcode and argument.
+pub fn parse_instructions_from_bytes(bytes: &[u8]) -> Result<Box<[CodeUnit]>> {
+    bytes
+        .chunks_exact(2)
+        .map(|cu| {
+            let op = Instruction::try_from(cu[0])?;
+            let arg = OpArgByte(cu[1]);
+            Ok(CodeUnit { op, arg })
+        })
+        .collect()
+}
+
 pub struct Cursor<B> {
     pub data: B,
     pub position: usize,
@@ -185,14 +198,7 @@ pub fn deserialize_code<R: Read, Bag: ConstantBag>(
 ) -> Result<CodeObject<Bag::Constant>> {
     let len = rdr.read_u32()?;
     let instructions = rdr.read_slice(len * 2)?;
-    let instructions = instructions
-        .chunks_exact(2)
-        .map(|cu| {
-            let op = Instruction::try_from(cu[0])?;
-            let arg = OpArgByte(cu[1]);
-            Ok(CodeUnit { op, arg })
-        })
-        .collect::<Result<Box<[CodeUnit]>>>()?;
+    let instructions = parse_instructions_from_bytes(instructions)?;
 
     let len = rdr.read_u32()?;
     let locations = (0..len)