Fixed just version

Author: transistorfet

.github/workflows/deploy-docs.yaml

@@ -29,12 +29,14 @@ jobs:
 
       - uses: jetli/wasm-bindgen-action@v0.2.0
         with:
+          # NOTE version here must match the emulator/frontends/pixels/Cargo.lock version
           version: 0.2.92
 
       - name: Install dependencies
         run: |
           sudo apt-get install -y alsa-base libasound2-dev libxkbcommon-dev
-          cargo install just
+          # NOTE version here is pinned because it must be compilable with MSRV
+          cargo install just --version 1.22.0
 
       - name: Make build directory
         run: mkdir build

Cargo.lock

@@ -57,7 +57,7 @@ impl<BusError> From<Error> for M68kError<BusError> {
         match err {
             Error::Processor(ex) => M68kError::Interrupt(ex as u8),
             Error::Breakpoint(_) => M68kError::Breakpoint,
-            Error::Other(msg) | Error::Assertion(msg) | Error::Emulator(_, msg) => M68kError::Other(msg.to_string()),
+            Error::Other(msg) | Error::Assertion(msg) | Error::Emulator(_, msg) => M68kError::Other(msg),
         }
     }
 }

emulator/cpus/m68k/src/moa.rs

@@ -71,7 +71,7 @@ impl From<Error> for Z80Error {
         match err {
             Error::Processor(ex) => Z80Error::BusError(format!("processor error {}", ex)),
             Error::Breakpoint(_) => Z80Error::Breakpoint,
-            Error::Other(msg) | Error::Assertion(msg) | Error::Emulator(_, msg) => Z80Error::BusError(msg.to_string()),
+            Error::Other(msg) | Error::Assertion(msg) | Error::Emulator(_, msg) => Z80Error::BusError(msg),
         }
     }
 }

emulator/cpus/z80/src/execute.rs

@@ -6,7 +6,7 @@ default-run = "moa-computie"
 
 [dependencies]
 log = "0.4"
-clap = "4.4"
+clap = "=4.4"
 simple_logger = "4"
 femtos = "0.1"
 

emulator/frontends/console/Cargo.toml

@@ -7,7 +7,7 @@ default-run = "moa-genesis"
 [dependencies]
 log = "0.4"
 minifb = "0.25"
-clap = "4.4"
+clap = "=4.4"
 simple_logger = "4"
 femtos = "0.1"
 

emulator/frontends/minifb/Cargo.toml

@@ -156,7 +156,7 @@ fn init_execute_test(cputype: Z80Type, state: &TestState, ports: &[TestPort]) ->
     let io_ram = Device::new(MemoryBlock::new(vec![0; 0x10000]));
     let io_bus = Rc::new(RefCell::new(Bus::default()));
     io_bus.borrow_mut().set_ignore_unmapped(true);
-    io_bus.borrow_mut().insert(0x0000, io_ram.clone());
+    io_bus.borrow_mut().insert(0x0000, io_ram);
 
     let port = BusPort::new(0, 16, 8, system.bus.clone());
     let ioport = BusPort::new(0, 16, 8, io_bus.clone());

tests/rad_tests/src/main.rs

@@ -1,9 +1,9 @@
 
-* convert the Z80
 * implement Inspect/Debug traits
 * fix dump_state everywhere, which now requires a writer.  Is there an easier way?  Is there a way that doesn't require std
 * fix it to use the full 68k address space, and maybe see if it's possible to make the address translation cleaner/nicer/simpler/faster
 * figure out how to do interrupts, and add them to emulator-hal, implement them in m68k
+* convert the Z80
 * convert peripherals to use BusAccess and Step
 * replace Addressable/Steppable and modify Transmutable to use the emulator-hal traits
 * remove the custom moa impls from m68k if possible at this point