Fixed missing feature flag and clippy

transistorfet · Mar 21, 2024 · 3a6e337 · 3a6e337
1 parent 12861b8
commit 3a6e337
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/emulator/cpus/m68k/Cargo.toml b/emulator/cpus/m68k/Cargo.toml
@@ -8,7 +8,7 @@ log = "0.4"
 thiserror = "1.0"
 femtos = "0.1"
 moa-parsing = { path = "../../libraries/parsing" }
-emulator-hal = { path = "../../libraries/emulator-hal/emulator-hal" }
+emulator-hal = { path = "../../libraries/emulator-hal/emulator-hal", features = ["femtos"] }
 
 moa-core = { path = "../../core", optional = true }
 

diff --git a/emulator/cpus/m68k/src/debugger.rs b/emulator/cpus/m68k/src/debugger.rs
@@ -38,7 +38,7 @@ where
 
     type Error = M68kError<BusError>;
 
-    fn inspect(&mut self, info: Self::InfoType, bus: &mut Bus, writer: &mut Writer) -> Result<(), Self::Error> {
+    fn inspect(&mut self, info: Self::InfoType, _bus: &mut Bus, writer: &mut Writer) -> Result<(), Self::Error> {
         match info {
             M68kInfo::State => self
                 .state
@@ -77,11 +77,11 @@ where
     }
 
     fn add_breakpoint(&mut self, address: M68kAddress) {
-        self.debugger.breakpoints.push(address as u32);
+        self.debugger.breakpoints.push(address);
     }
 
     fn remove_breakpoint(&mut self, address: M68kAddress) {
-        if let Some(index) = self.debugger.breakpoints.iter().position(|a| *a == address as u32) {
+        if let Some(index) = self.debugger.breakpoints.iter().position(|a| *a == address) {
             self.debugger.breakpoints.remove(index);
         }
     }

diff --git a/emulator/cpus/m68k/src/state.rs b/emulator/cpus/m68k/src/state.rs
@@ -194,19 +194,11 @@ pub enum M68kError<BusError> {
     Other(String),
 }
 
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub struct M68kStatistics {
     pub cycle_number: usize,
 }
 
-impl Default for M68kStatistics {
-    fn default() -> Self {
-        Self {
-            cycle_number: 0,
-        }
-    }
-}
-
 #[derive(Clone)]
 pub struct M68k<Instant> {
     pub info: CpuInfo,