From eace2d3a45222595ec45b888043b7d907a65a0d6 Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Sun, 13 Mar 2022 20:10:37 +0000 Subject: [PATCH 1/3] Make just fail if there is an error --- justfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/justfile b/justfile index 82e36a0..fe40dc5 100644 --- a/justfile +++ b/justfile @@ -22,12 +22,11 @@ run-game game: run-game-debug game: (cd "examples/{{game}}" && cargo run) -ci: && build-roms +ci: && build-roms build-book just _all-crates _build just _all-crates _test-debug just _all-crates _test-release just _all-crates _clippy - just build-book build-roms: just _build-rom "examples/the-purple-night" "PURPLENIGHT" @@ -67,17 +66,17 @@ _build-rom folder name: _all-crates target: for CARGO_PROJECT_FILE in agb-*/Cargo.toml agb/Cargo.toml examples/*/Cargo.toml book/games/*/Cargo.toml; do \ PROJECT_DIR=$(dirname "$CARGO_PROJECT_FILE"); \ - just "{{target}}" "$PROJECT_DIR"; \ + just "{{target}}" "$PROJECT_DIR" || exit $?; \ done _build crate: (cd "{{crate}}" && cargo build) _test-release crate: - if echo "{{crate}}" | grep -qE '^agb'; then (cd "{{crate}}" && cargo test --release); fi + {{ if crate =~ 'agb.*' { "cd " + crate + " && cargo test --release" } else { "" } }} _test-debug crate: - if echo "{{crate}}" | grep -qE '^agb'; then (cd "{{crate}}" && cargo test); fi + {{ if crate =~ 'agb.*' { "cd " + crate + " && cargo test" } else { "" } }} _clippy crate: - if echo "{{crate}}" | grep -qE '^agb'; then (cd "{{crate}}" && cargo clippy); fi + {{ if crate =~ 'agb.*' { "cd " + crate + " && cargo clippy" } else { "" } }} _clean crate: (cd "{{crate}}" && cargo clean) From 9e8cdc67299f6b9b7f23d95956c0801cc36de454 Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Sun, 13 Mar 2022 20:11:43 +0000 Subject: [PATCH 2/3] Iter is now exclusive --- agb-fixnum/src/lib.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/agb-fixnum/src/lib.rs b/agb-fixnum/src/lib.rs index a7a84f6..efa6586 100644 --- a/agb-fixnum/src/lib.rs +++ b/agb-fixnum/src/lib.rs @@ -936,19 +936,12 @@ mod tests { (5, 5), (6, 5), (7, 5), - (8, 5), (5, 6), (6, 6), (7, 6), - (8, 6), (5, 7), (6, 7), (7, 7), - (8, 7), - (5, 8), - (6, 8), - (7, 8), - (8, 8), ] ); } From b88ad5cba5397550d98523a64c622718552c7ed8 Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Sun, 13 Mar 2022 20:12:49 +0000 Subject: [PATCH 3/3] VRamManager should definitely not have a public new --- agb/src/display/tiled/vram_manager.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agb/src/display/tiled/vram_manager.rs b/agb/src/display/tiled/vram_manager.rs index 76be999..2d36fec 100644 --- a/agb/src/display/tiled/vram_manager.rs +++ b/agb/src/display/tiled/vram_manager.rs @@ -109,7 +109,7 @@ pub struct VRamManager<'a> { } impl<'a> VRamManager<'a> { - pub fn new() -> Self { + pub(crate) fn new() -> Self { Self { tilesets: Vec::new(), generation: 0,