alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-23 07:36:33 +11:00
Code Issues Projects Releases Packages Wiki Activity

Move clippy deny to config.toml and fix warnings

Browse source
This commit is contained in:
Gwilym Kuiper 2022-04-23 17:10:29 +01:00
parent 3143d89359
commit 1593c0e8b6
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
agb/.cargo/config.toml
View file

@ -6,5 +6,5 @@ build-std-features = ["compiler-builtins-mem"]
target = "thumbv4t-none-eabi" target = "thumbv4t-none-eabi"
[target.thumbv4t-none-eabi] [target.thumbv4t-none-eabi]
rustflags = ["-Clink-arg=-Tgba.ld", "-Ctarget-cpu=arm7tdmi"] rustflags = ["-Clink-arg=-Tgba.ld", "-Ctarget-cpu=arm7tdmi", "-Dwarnings", "-Dclippy::all"]
runner = "mgba-test-runner" runner = "mgba-test-runner"

15
agb/src/display/object.rs
View file

@ -19,10 +19,6 @@ use crate::agb_alloc::bump_allocator::StartEnd;
use crate::dma; use crate::dma;
use crate::fixnum::Vector2D; use crate::fixnum::Vector2D;
use crate::hash_map::HashMap; use crate::hash_map::HashMap;
use crate::interrupt::free;
use bare_metal::Mutex;
use core::cell::RefCell;
use attributes::*; use attributes::*;
@ -52,13 +48,14 @@ impl DerefMut for ObjectControllerRef {
} }
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
static OBJECT_REFS_CURRENT: Mutex<RefCell<i32>> = Mutex::new(RefCell::new(0)); static OBJECT_REFS_CURRENT: bare_metal::Mutex<core::cell::RefCell<i32>> =
bare_metal::Mutex::new(core::cell::RefCell::new(0));
impl ObjectControllerRef { impl ObjectControllerRef {
fn new() -> Self { fn new() -> Self {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
{ {
let a = free(|c| { let a = crate::interrupt::free(|c| {
let mut b = OBJECT_REFS_CURRENT.borrow(*c).borrow_mut(); let mut b = OBJECT_REFS_CURRENT.borrow(*c).borrow_mut();
let a = *b; let a = *b;
*b += 1; *b += 1;
@ -78,7 +75,7 @@ impl ObjectControllerRef {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
impl Drop for ObjectControllerRef { impl Drop for ObjectControllerRef {
fn drop(&mut self) { fn drop(&mut self) {
free(|c| { crate::interrupt::free(|c| {
let mut b = OBJECT_REFS_CURRENT.borrow(*c).borrow_mut(); let mut b = OBJECT_REFS_CURRENT.borrow(*c).borrow_mut();
*b -= 1; *b -= 1;
}) })
@ -444,7 +441,7 @@ struct ObjectInner {
} }
struct ObjectControllerStatic { struct ObjectControllerStatic {
free_affine_matricies: Vec<u8>, _free_affine_matricies: Vec<u8>,
free_object: Vec<u8>, free_object: Vec<u8>,
shadow_oam: Vec<Option<ObjectInner>>, shadow_oam: Vec<Option<ObjectInner>>,
z_order: Vec<u8>, z_order: Vec<u8>,
@ -457,7 +454,7 @@ impl ObjectControllerStatic {
shadow_oam: (0..128).map(|_| None).collect(), shadow_oam: (0..128).map(|_| None).collect(),
z_order: (0..128).collect(), z_order: (0..128).collect(),
free_object: (0..128).collect(), free_object: (0..128).collect(),
free_affine_matricies: (0..32).collect(), _free_affine_matricies: (0..32).collect(),
sprite_controller: SpriteControllerInner::new(), sprite_controller: SpriteControllerInner::new(),
} }
} }