diff --git a/src/emu/graphics.rs b/src/emu/graphics.rs index 887b358..330dec7 100644 --- a/src/emu/graphics.rs +++ b/src/emu/graphics.rs @@ -1,8 +1,8 @@ use std::cell::{Ref, RefCell}; use crate::emu::memory::Memory; use crate::emu::memory::RamMemory; -use crate::misc::emulator_error::DeviceType::GRAPHICS; -use crate::misc::emulator_error::EmulatorError; +use crate::misc::error::DeviceType::GRAPHICS; +use crate::misc::error::EmulatorError; use crate::misc::result::EmulatorResult; pub const DEVICE_FRAMEBUFFER_SIZE: usize = 256 * 256; diff --git a/src/emu/memory.rs b/src/emu/memory.rs index f0d0d8a..f3e840f 100644 --- a/src/emu/memory.rs +++ b/src/emu/memory.rs @@ -1,7 +1,7 @@ use std::cell::{Ref, RefCell, RefMut}; -use crate::misc::emulator_error::DeviceType::RAM; -use crate::misc::emulator_error::EmulatorError; +use crate::misc::error::DeviceType::RAM; +use crate::misc::error::EmulatorError; use crate::misc::endian::{read_big_endian_u24, write_big_endian_u16}; use crate::misc::result::EmulatorResult; diff --git a/src/graphics/color.rs b/src/graphics/color.rs index fa69d3a..a5db837 100644 --- a/src/graphics/color.rs +++ b/src/graphics/color.rs @@ -1,4 +1,4 @@ -use crate::misc::emulator_error::EmulatorError; +use crate::misc::error::EmulatorError; use crate::misc::result::EmulatorResult; /// A Color as represented in BytePusher. diff --git a/src/graphics/graphics_adapter.rs b/src/graphics/graphics_adapter.rs index 3d324e7..b7696e6 100644 --- a/src/graphics/graphics_adapter.rs +++ b/src/graphics/graphics_adapter.rs @@ -3,7 +3,7 @@ use sdl2::rect::Rect; use sdl2::render::WindowCanvas; use crate::emu::graphics::GraphicsProcessor; use crate::graphics::color::Color; -use crate::misc::emulator_error::EmulatorError; +use crate::misc::error::EmulatorError; use crate::misc::result::EmulatorResult; diff --git a/src/misc/emulator_error.rs b/src/misc/error.rs similarity index 91% rename from src/misc/emulator_error.rs rename to src/misc/error.rs index 3f88f0f..d08fc64 100644 --- a/src/misc/emulator_error.rs +++ b/src/misc/error.rs @@ -1,7 +1,7 @@ use std::array::TryFromSliceError; use std::fmt::Debug; use std::io::Error; -use crate::misc::emulator_error::EmulatorError::EmulatorIOError; +use crate::misc::error::EmulatorError::EmulatorIOError; #[derive(Debug, Copy, Clone)] pub enum DeviceType { diff --git a/src/misc/mod.rs b/src/misc/mod.rs index 7113f1e..ad00a2e 100644 --- a/src/misc/mod.rs +++ b/src/misc/mod.rs @@ -1,3 +1,3 @@ pub mod endian; -pub mod emulator_error; +pub mod error; pub mod result; \ No newline at end of file diff --git a/src/misc/result.rs b/src/misc/result.rs index 78f8832..3a59779 100644 --- a/src/misc/result.rs +++ b/src/misc/result.rs @@ -1,3 +1,3 @@ -use crate::misc::emulator_error::EmulatorError; +use crate::misc::error::EmulatorError; pub type EmulatorResult = Result; \ No newline at end of file