Fixed just version

.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

@@ -207,30 +207,30 @@ dependencies = [
  "clap_lex 0.2.4",
  "indexmap 1.9.3",
  "once_cell",
- "strsim 0.10.0",
+ "strsim",
  "termcolor",
  "textwrap",
 ]
 
 [[package]]
 name = "clap"
-version = "4.5.3"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.7.0",
+ "clap_lex 0.6.0",
- "strsim 0.11.0",
+ "strsim",
 ]
 
 [[package]]
@@ -257,9 +257,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "colorchoice"
@@ -796,7 +796,7 @@ dependencies = [
 name = "moa-console"
 version = "0.1.0"
 dependencies = [
- "clap 4.5.3",
+ "clap 4.4.18",
  "femtos",
  "log",
  "moa-common",
@@ -854,7 +854,7 @@ dependencies = [
 name = "moa-minifb"
 version = "0.1.0"
 dependencies = [
- "clap 4.5.3",
+ "clap 4.4.18",
  "femtos",
  "log",
  "minifb",
@@ -1433,12 +1433,6 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "strsim"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
-
 [[package]]
 name = "syn"
 version = "1.0.109"

emulator/cpus/m68k/src/moa.rs

@@ -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/z80/src/execute.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/frontends/console/Cargo.toml

@@ -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/minifb/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"
 

tests/rad_tests/src/main.rs

@@ -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());

todo.txt

@@ -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