Remove Eq & ParitalEq for RealInstruction

ShaharNaveh · ShaharNaveh · commit 8ae98b2c3e7c · 2026-01-14T10:40:47.000+02:00
diff --git a/crates/compiler-core/src/bytecode/instruction.rs b/crates/compiler-core/src/bytecode/instruction.rs
@@ -15,7 +15,7 @@ use crate::{
 /// A Single bytecode instruction.
 /// Instructions are ordered to match CPython 3.13 opcode numbers exactly.
 /// HAVE_ARGUMENT = 44: opcodes 0-43 have no argument, 44+ have arguments.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug)]
 #[repr(u8)]
 pub enum RealInstruction {
     // ==================== No-argument instructions (opcode < 44) ====================
@@ -784,7 +784,7 @@ impl InstructionMetadata for RealInstruction {
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug)]
 #[repr(u16)]
 pub enum PseudoInstruction {
     Jump {
@@ -816,6 +816,8 @@ pub enum PseudoInstruction {
     StoreFastMaybeNull = 267, // Placeholder
 }
 
+const _: () = assert!(mem::size_of::<PseudoInstruction>() == 2);
+
 impl From<PseudoInstruction> for u16 {
     #[inline]
     fn from(ins: PseudoInstruction) -> Self {
@@ -884,9 +886,8 @@ impl InstructionMetadata for PseudoInstruction {
     }
 }
 
-const _: () = assert!(mem::size_of::<PseudoInstruction>() == 2);
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug)]
+#[repr(u16)]
 pub enum Instruction {
     Real(RealInstruction),
     Pseudo(PseudoInstruction),
diff --git a/crates/compiler-core/src/bytecode/oparg.rs b/crates/compiler-core/src/bytecode/oparg.rs
@@ -80,7 +80,7 @@ impl OpArgState {
     #[inline(always)]
     pub fn get(&mut self, ins: CodeUnit) -> (RealInstruction, OpArg) {
         let arg = self.extend(ins.arg);
-        if ins.op != RealInstruction::ExtendedArg {
+        if !matches!(ins.op, RealInstruction::ExtendedArg) {
             self.reset();
         }
         (ins.op, arg)

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ impl OpArgState {`
`80`	`80`	`#[inline(always)]`
`81`	`81`	`pub fn get(&mut self, ins: CodeUnit) -> (RealInstruction, OpArg) {`
`82`	`82`	`let arg = self.extend(ins.arg);`
`83`		`- if ins.op != RealInstruction::ExtendedArg {`
	`83`	`+ if !matches!(ins.op, RealInstruction::ExtendedArg) {`
`84`	`84`	`self.reset();`
`85`	`85`	`}`
`86`	`86`	`(ins.op, arg)`