From b2b5270fcdc01988fa340005eae96e8253a4c045 Mon Sep 17 00:00:00 2001 From: Shish Date: Sat, 6 Apr 2024 17:11:59 +0100 Subject: [PATCH] [rs] use bitflags in each module --- rs/src/buttons.rs | 2 ++ rs/src/consts.rs | 2 ++ rs/src/cpu.rs | 2 ++ rs/src/gpu.rs | 2 ++ rs/src/main.rs | 3 --- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rs/src/buttons.rs b/rs/src/buttons.rs index e1d73ee0..1a5f8543 100644 --- a/rs/src/buttons.rs +++ b/rs/src/buttons.rs @@ -1,3 +1,5 @@ +use bitflags::bitflags; + extern crate sdl2; use crate::consts::*; use crate::cpu; diff --git a/rs/src/consts.rs b/rs/src/consts.rs index c35e5568..ff67d1c3 100644 --- a/rs/src/consts.rs +++ b/rs/src/consts.rs @@ -1,3 +1,5 @@ +use bitflags::bitflags; + pub enum Mem { VBlankHandler = 0x40, LcdHandler = 0x48, diff --git a/rs/src/cpu.rs b/rs/src/cpu.rs index 2c6c0bd0..36de2676 100644 --- a/rs/src/cpu.rs +++ b/rs/src/cpu.rs @@ -1,3 +1,5 @@ +use bitflags::bitflags; + use crate::consts::*; use crate::errors::*; use crate::ram; diff --git a/rs/src/gpu.rs b/rs/src/gpu.rs index 95ba5f31..e2c7c0ad 100644 --- a/rs/src/gpu.rs +++ b/rs/src/gpu.rs @@ -1,3 +1,5 @@ +use bitflags::bitflags; + extern crate sdl2; use crate::consts::*; use crate::cpu; diff --git a/rs/src/main.rs b/rs/src/main.rs index 1b88f279..b13e7da3 100644 --- a/rs/src/main.rs +++ b/rs/src/main.rs @@ -10,9 +10,6 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use crate::errors::ControlledExit; -#[macro_use] -extern crate bitflags; - mod apu; mod args; mod buttons;