Error: Remove FunkyMathError and Stringly Typed context

src/bus.rs

@@ -5,7 +5,7 @@
 //!
 //! This is more of a memory management unit + some utils for reading/writing
 
-use crate::error::Result;
+use crate::error::{Error::MissingRegion, Result};
 use std::{
     fmt::{Debug, Display, Formatter},
     ops::Range,
@@ -319,9 +319,7 @@ impl Bus {
                 }
             }
         } else {
-            return Err(crate::error::Error::MissingRegion {
+            return Err(MissingRegion { region: REGION });
-                region: REGION.to_string(),
-            });
         }
         Ok(())
     }

src/error.rs

@@ -3,6 +3,7 @@
 
 //! Error type for Chirp
 
+use crate::bus::Region;
 use thiserror::Error;
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -10,13 +11,15 @@ pub type Result<T> = std::result::Result<T, Error>;
 #[derive(Debug, Error)]
 pub enum Error {
     #[error("Unrecognized opcode {word}")]
-    UnimplementedInstruction { word: u16 },
+    UnimplementedInstruction {
-    #[error("Math was funky when parsing {word}: {explanation}")]
+        word: u16,
-    FunkyMath { word: u16, explanation: String },
+    },
     #[error("No {region} found on bus")]
-    MissingRegion { region: String },
+    MissingRegion {
+        region: Region,
+    },
     #[error(transparent)]
     IoError(#[from] std::io::Error),
     #[error(transparent)]
-    WindowError(#[from] minifb::Error),
+    MinifbError(#[from] minifb::Error),
 }

tests/integration.rs

@@ -191,10 +191,8 @@ mod cpu {
 
 #[test]
 fn error() {
-    let error = chirp::error::Error::FunkyMath {
+    let error = chirp::error::Error::MissingRegion { region: Screen };
-        word: 0x1234,
+    // Print it with Display and Debug
-        explanation: "This shit was funky".to_owned(),
-    };
     println!("{error} {error:?}");
 }