Fix Constants newtype usage in init_cleanup_code

youknowone · youknowone · commit dbd8b1a46604 · 2026-03-10T13:08:11.000+09:00
diff --git a/.cspell.json b/.cspell.json
@@ -61,7 +61,6 @@
     "dedents",
     "deduped",
     "deoptimize",
-    "descrs",
     "downcastable",
     "downcasted",
     "dumpable",
diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs
@@ -1176,7 +1176,7 @@ long_float_action!(compactlong_float_subtract, -);
 long_float_action!(compactlong_float_multiply, *);
 long_float_action!(compactlong_float_true_div, /);
 
-static BINARY_OP_EXTEND_DESCRS: &[BinaryOpExtendSpecializationDescr] = &[
+static BINARY_OP_EXTEND_DESCRIPTORS: &[BinaryOpExtendSpecializationDescr] = &[
     // long-long arithmetic
     BinaryOpExtendSpecializationDescr {
         oparg: bytecode::BinaryOperator::Or,
@@ -7270,7 +7270,7 @@ impl ExecutingFrame<'_> {
         if ptr == 0 {
             return None;
         }
-        // SAFETY: We only store pointers to entries in `BINARY_OP_EXTEND_DESCRS`.
+        // SAFETY: We only store pointers to entries in `BINARY_OP_EXTEND_DESCRIPTORS`.
         Some(unsafe { &*(ptr as *const BinaryOpExtendSpecializationDescr) })
     }
 
@@ -7282,7 +7282,7 @@ impl ExecutingFrame<'_> {
         rhs: &PyObject,
         vm: &VirtualMachine,
     ) -> Option<&'static BinaryOpExtendSpecializationDescr> {
-        BINARY_OP_EXTEND_DESCRS
+        BINARY_OP_EXTEND_DESCRIPTORS
             .iter()
             .find(|d| d.oparg == op && (d.guard)(lhs, rhs, vm))
     }
diff --git a/crates/vm/src/vm/context.rs b/crates/vm/src/vm/context.rs
@@ -427,7 +427,7 @@ impl Context {
             obj_name: names.__init__,
             qualname: names.__init__,
             cell2arg: None,
-            constants: Vec::new().into_boxed_slice(),
+            constants: core::iter::empty().collect(),
             names: Vec::new().into_boxed_slice(),
             varnames: Vec::new().into_boxed_slice(),
             cellvars: Vec::new().into_boxed_slice(),
