devraza/rustboyadvance-ng
Archived
1
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Fix bad use statements after refactoring

Browse source 
Former-commit-id: d7e01c4d78058e62905cc3bb7a19e01b02d80882
Former-commit-id: a887db8f429ae4c495071bc8e2678d3e8d007dbe
This commit is contained in:
Michel Heily 2022-09-15 01:21:11 +03:00
parent a750cb8e16
commit de82bb171c
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/gpu/render/bitmap.rs
View file

@ -6,7 +6,7 @@ use super::super::Rgb15;
use super::{utils, MODE5_VIEWPORT, SCREEN_VIEWPORT}; use super::{utils, MODE5_VIEWPORT, SCREEN_VIEWPORT};
use crate::Bus; use crate::prelude::BusIO;
use rustboyadvance_utils::index2d; use rustboyadvance_utils::index2d;
impl Gpu { impl Gpu {

3
core/src/gpu/render/text.rs
View file

@ -4,8 +4,7 @@ use super::super::consts::*;
use super::super::Rgb15; use super::super::Rgb15;
use super::super::{Gpu, PixelFormat, SCREEN_BLOCK_SIZE}; use super::super::{Gpu, PixelFormat, SCREEN_BLOCK_SIZE};
use super::{utils, ViewPort}; use super::{utils, ViewPort};
use crate::prelude::BusIO;
use crate::Bus;
use rustboyadvance_utils::index2d; use rustboyadvance_utils::index2d;

8
core/src/lib.rs
View file

@ -44,13 +44,11 @@ pub use interrupt::Interrupt;
pub use interrupt::SharedInterruptFlags; pub use interrupt::SharedInterruptFlags;
pub mod gba; pub mod gba;
pub use gba::GameBoyAdvance; pub use gba::GameBoyAdvance;
pub mod bus;
pub mod dma; pub mod dma;
pub mod keypad; pub mod keypad;
pub mod timer;
pub use bus::*;
mod mgba_debug; mod mgba_debug;
pub(crate) mod overrides; pub(crate) mod overrides;
pub mod timer;
#[cfg(feature = "debugger")] #[cfg(feature = "debugger")]
pub mod debugger; pub mod debugger;
@ -97,7 +95,6 @@ impl From<zip::result::ZipError> for GBAError {
} }
pub mod prelude { pub mod prelude {
pub use super::arm7tdmi;
pub use super::cartridge::{Cartridge, GamepakBuilder}; pub use super::cartridge::{Cartridge, GamepakBuilder};
#[cfg(feature = "debugger")] #[cfg(feature = "debugger")]
pub use super::debugger::Debugger; pub use super::debugger::Debugger;
@ -105,7 +102,8 @@ pub mod prelude {
pub use super::sound::interface::{ pub use super::sound::interface::{
AudioInterface, DynAudioInterface, NullAudio, SimpleAudioInterface, AudioInterface, DynAudioInterface, NullAudio, SimpleAudioInterface,
}; };
pub use super::Bus;
pub use super::{GBAError, GBAResult, GameBoyAdvance}; pub use super::{GBAError, GBAResult, GameBoyAdvance};
pub use arm7tdmi;
pub use arm7tdmi::memory::{Addr, BusIO, MemoryAccess, MemoryAccessWidth, MemoryInterface};
pub use rustboyadvance_utils::{read_bin_file, write_bin_file}; pub use rustboyadvance_utils::{read_bin_file, write_bin_file};
} }

4
core/src/mgba_debug.rs
View file

@ -4,8 +4,8 @@ use std::str;
use log::log; use log::log;
use log::Level; use log::Level;
use super::bus::Bus; use super::arm7tdmi::memory::BusIO;
use super::iodev::consts::{REG_DEBUG_ENABLE, REG_DEBUG_FLAGS, REG_DEBUG_STRING}; use crate::iodev::consts::{REG_DEBUG_ENABLE, REG_DEBUG_FLAGS, REG_DEBUG_STRING};
pub const DEBUG_STRING_SIZE: usize = 0x100; pub const DEBUG_STRING_SIZE: usize = 0x100;