From cf6e6385ec502788a0ce2cb6973189f6dd525336 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Wed, 7 May 2025 08:43:13 +0200 Subject: [PATCH] move containers to own mod --- src/commands/cp437_grid_command.rs | 1 - src/commands/generic_command.rs | 6 +++--- src/{ => containers}/bitmap.rs | 8 ++++++-- src/{ => containers}/bitvec.rs | 2 +- src/{ => containers}/brightness_grid.rs | 2 +- src/{ => containers}/byte_slice.rs | 0 src/{ => containers}/char_grid.rs | 2 +- src/{ => containers}/cp437_grid.rs | 2 +- src/containers/mod.rs | 13 +++++++++++++ src/lib.rs | 7 +------ src/packet.rs | 2 +- 11 files changed, 28 insertions(+), 17 deletions(-) rename src/{ => containers}/bitmap.rs (95%) rename src/{ => containers}/bitvec.rs (98%) rename src/{ => containers}/brightness_grid.rs (98%) rename src/{ => containers}/byte_slice.rs (100%) rename src/{ => containers}/char_grid.rs (98%) rename src/{ => containers}/cp437_grid.rs (98%) create mode 100644 src/containers/mod.rs diff --git a/src/commands/cp437_grid_command.rs b/src/commands/cp437_grid_command.rs index 2ccb000..eb42d15 100644 --- a/src/commands/cp437_grid_command.rs +++ b/src/commands/cp437_grid_command.rs @@ -82,7 +82,6 @@ pub unsafe extern "C" fn sp_cmd_cp437_grid_get_origin( } } - /// Sets the origin field of the [Cp437GridCommand]. /// /// Rust equivalent: `cp437_command.origin = Origin::new(origin_x, origin_y)` diff --git a/src/commands/generic_command.rs b/src/commands/generic_command.rs index 561d041..2b5327d 100644 --- a/src/commands/generic_command.rs +++ b/src/commands/generic_command.rs @@ -2,9 +2,9 @@ use crate::{ heap_clone, heap_drop, heap_move_nonnull, heap_move_ok, heap_remove, }; use servicepoint::{ - BitVecCommand, BitmapCommand, BrightnessGridCommand, - CharGridCommand, ClearCommand, Cp437GridCommand, FadeOutCommand, - GlobalBrightnessCommand, HardResetCommand, Packet, TypedCommand, + BitVecCommand, BitmapCommand, BrightnessGridCommand, CharGridCommand, + ClearCommand, Cp437GridCommand, FadeOutCommand, GlobalBrightnessCommand, + HardResetCommand, Packet, TypedCommand, }; use std::ptr::{null_mut, NonNull}; diff --git a/src/bitmap.rs b/src/containers/bitmap.rs similarity index 95% rename from src/bitmap.rs rename to src/containers/bitmap.rs index 3393671..f928596 100644 --- a/src/bitmap.rs +++ b/src/containers/bitmap.rs @@ -1,6 +1,10 @@ -use crate::{byte_slice::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, heap_move_ok, heap_move_some, heap_remove}; +use crate::{ + containers::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, + heap_move_ok, heap_move_some, heap_remove, +}; use servicepoint::{ - Bitmap, BitmapCommand, CompressionCode, DataRef, Grid, Origin, Packet, DisplayBitVec + Bitmap, BitmapCommand, CompressionCode, DataRef, DisplayBitVec, Grid, + Origin, Packet, }; use std::ptr::NonNull; diff --git a/src/bitvec.rs b/src/containers/bitvec.rs similarity index 98% rename from src/bitvec.rs rename to src/containers/bitvec.rs index ec5aa4c..fd1132d 100644 --- a/src/bitvec.rs +++ b/src/containers/bitvec.rs @@ -1,5 +1,5 @@ use crate::{ - byte_slice::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, + containers::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, heap_move_ok, heap_remove, }; use servicepoint::{ diff --git a/src/brightness_grid.rs b/src/containers/brightness_grid.rs similarity index 98% rename from src/brightness_grid.rs rename to src/containers/brightness_grid.rs index dc3b2f7..b6b3f04 100644 --- a/src/brightness_grid.rs +++ b/src/containers/brightness_grid.rs @@ -1,5 +1,5 @@ use crate::{ - byte_slice::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, + containers::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, heap_move_ok, heap_move_some, heap_remove, }; use servicepoint::{ diff --git a/src/byte_slice.rs b/src/containers/byte_slice.rs similarity index 100% rename from src/byte_slice.rs rename to src/containers/byte_slice.rs diff --git a/src/char_grid.rs b/src/containers/char_grid.rs similarity index 98% rename from src/char_grid.rs rename to src/containers/char_grid.rs index 62aba87..4e11e19 100644 --- a/src/char_grid.rs +++ b/src/containers/char_grid.rs @@ -1,5 +1,5 @@ use crate::{ - byte_slice::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, + containers::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, heap_move_ok, heap_remove, }; use servicepoint::{CharGrid, CharGridCommand, Grid, Origin, Packet}; diff --git a/src/cp437_grid.rs b/src/containers/cp437_grid.rs similarity index 98% rename from src/cp437_grid.rs rename to src/containers/cp437_grid.rs index b4d449e..3d3885a 100644 --- a/src/cp437_grid.rs +++ b/src/containers/cp437_grid.rs @@ -1,5 +1,5 @@ use crate::{ - byte_slice::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, + containers::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, heap_move_ok, heap_move_some, heap_remove, }; use servicepoint::{ diff --git a/src/containers/mod.rs b/src/containers/mod.rs new file mode 100644 index 0000000..62d51d0 --- /dev/null +++ b/src/containers/mod.rs @@ -0,0 +1,13 @@ +mod bitmap; +mod bitvec; +mod brightness_grid; +mod byte_slice; +mod char_grid; +mod cp437_grid; + +pub use bitmap::*; +pub use bitvec::*; +pub use brightness_grid::*; +pub use byte_slice::*; +pub use char_grid::*; +pub use cp437_grid::*; diff --git a/src/lib.rs b/src/lib.rs index de22866..8196e3b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -27,13 +27,8 @@ use std::ptr::NonNull; -pub mod bitmap; -pub mod bitvec; -pub mod brightness_grid; -pub mod byte_slice; -pub mod char_grid; pub mod commands; -pub mod cp437_grid; +pub mod containers; pub mod packet; pub mod udp; diff --git a/src/packet.rs b/src/packet.rs index 16509be..a6fde16 100644 --- a/src/packet.rs +++ b/src/packet.rs @@ -1,5 +1,5 @@ use crate::{ - byte_slice::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, + containers::ByteSlice, heap_clone, heap_drop, heap_move_nonnull, heap_move_ok, }; use servicepoint::{CommandCode, Header, Packet};