Linter fix and update dependencies

alexander-akhmetov · Jan 2, 2022 · a2d7d9a · a2d7d9a
1 parent 52e4f92
commit a2d7d9a
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 156 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/cpu.rs b/src/cpu.rs
@@ -529,11 +529,7 @@ impl CPU {
         // C <- [76543210] <- C
         let mut value = self.get_operand(op);
 
-        let original_carry = match self.get_carry() {
-            FLAG_CARRY => true,
-            _ => false,
-        };
-
+        let original_carry = matches!(self.get_carry(), FLAG_CARRY);
         if (value >> 7) != 0 {
             self.set_carry();
         } else {
@@ -563,11 +559,7 @@ impl CPU {
         // C -> [76543210] -> C
         let mut value = self.get_operand(op);
 
-        let original_carry = match self.get_carry() {
-            FLAG_CARRY => true,
-            _ => false,
-        };
-
+        let original_carry = matches!(self.get_carry(), FLAG_CARRY);
         if (value & 0x01) != 0 {
             self.set_carry();
         } else {

diff --git a/src/functional-tests.rs b/src/functional-tests.rs
@@ -30,7 +30,7 @@ fn main() {
         .unwrap_or("6502_functional_test.bin");
 
     if !Path::new(filename).exists() {
-        panic!(format!("File {} does not exist", filename))
+        panic!("File {} does not exist", filename)
     }
 
     cpu.load(&fs::read(filename).unwrap(), 0);