From 3accd8ce40c8e3a42b64330190544729edcfc80f Mon Sep 17 00:00:00 2001 From: Sam M W Date: Mon, 3 Apr 2023 07:38:38 +0100 Subject: [PATCH] as clippy suggests, convert from bool to u8/i8 --- src/cpu.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/cpu.rs b/src/cpu.rs index 371e3ff..eac754f 100644 --- a/src/cpu.rs +++ b/src/cpu.rs @@ -592,7 +592,7 @@ impl CPU { let mask = 1 << 7; let is_bit_7_set = (*p_val & mask) == mask; let shifted = (*p_val & !(1 << 7)) << 1; - *p_val = shifted + if is_carry_set { 1 } else { 0 }; + *p_val = shifted + u8::from(is_carry_set); status.set_with_mask( Status::PS_CARRY, Status::new(StatusArgs { @@ -655,11 +655,7 @@ impl CPU { fn add_with_carry(&mut self, value: i8) { let a_before: i8 = self.registers.accumulator; - let c_before: i8 = if self.registers.status.contains(Status::PS_CARRY) { - 1 - } else { - 0 - }; + let c_before: i8 = i8::from(self.registers.status.contains(Status::PS_CARRY)); let a_after: i8 = a_before.wrapping_add(c_before).wrapping_add(value); debug_assert_eq!(