Simplify public exports from memory

pineman · Jul 26, 2024 · af8c6c3 · af8c6c3
1 parent 1b27aad
commit af8c6c3
Show file tree

Hide file tree

Showing 4 changed files with 283 additions and 287 deletions.
diff --git a/fpt/src/memory/lib.rs b/fpt/src/memory/lib.rs
diff --git a/fpt/src/memory/mbc3.rs b/fpt/src/memory/mbc3.rs
@@ -1,5 +1,6 @@
+use super::cartridge::Cartridge;
 use super::cartridge::{convert_ram_size, convert_rom_size, get_ram_size, get_rom_size};
-use super::{map, Address, Cartridge, MemoryRange};
+use super::{map, Address, MemoryRange};
 
 pub struct Mbc3Cartridge {
     memory: Vec<u8>,

diff --git a/fpt/src/memory/mbc_builder.rs b/fpt/src/memory/mbc_builder.rs
@@ -1,9 +1,9 @@
 use std::cell::RefCell;
 
+use super::cartridge::Cartridge;
 use super::cartridge::{get_cartridge_type, EmptyCartridge};
-use super::mbc_none::NoMbcCartridge;
 use super::mbc3::Mbc3Cartridge;
-use super::Cartridge;
+use super::mbc_none::NoMbcCartridge;
 
 pub fn create_mbc(cartridge_data: &[u8]) -> Option<Box<RefCell<dyn Cartridge>>> {
     // https://gbdev.io/pandocs/The_Cartridge_Header.html#0147--cartridge-type