move containers to module

src/command.rs

@@ -1,13 +1,18 @@
-use crate::bitvec::BitVec;
+use crate::{
-use crate::brightness_grid::BrightnessGrid;
+    compression_code::CompressionCode,
-use crate::char_grid::CharGrid;
+    containers::{
-use crate::compression_code::CompressionCode;
+        bitmap::Bitmap, bitvec::BitVec, brightness_grid::BrightnessGrid,
-use crate::cp437_grid::Cp437Grid;
+        char_grid::CharGrid, cp437_grid::Cp437Grid,
-use crate::errors::ServicePointError;
+    },
-use servicepoint::{BitVecCommand, BrightnessGridCommand, CharGridCommand, ClearCommand, Cp437GridCommand, FadeOutCommand, GlobalBrightnessCommand, HardResetCommand, Origin};
+    errors::ServicePointError,
+    macros::wrap_uniffi_object,
+};
+use servicepoint::{
+    BitVecCommand, BrightnessGridCommand, CharGridCommand, ClearCommand,
+    Cp437GridCommand, FadeOutCommand, GlobalBrightnessCommand,
+    HardResetCommand, Origin,
+};
 use std::sync::Arc;
-use crate::bitmap::Bitmap;
-use crate::macros::wrap_uniffi_object;
 
 wrap_uniffi_object!(TypedCommand, Command);
 

src/containers/bitmap.rs

@@ -1,7 +1,5 @@
-use crate::macros::{
+use crate::macros::*;
-    wrap_get_set_fill_2d, wrap_uniffi_object, wrap_width_height,
+use servicepoint::Grid;
-};
-use servicepoint::{DataRef, Grid};
 use std::{ops::Deref, sync::Arc};
 
 wrap_uniffi_object!(Bitmap);

src/containers/bitvec.rs

@@ -1,5 +1,5 @@
-use std::sync::{Arc};
 use crate::macros::wrap_uniffi_object;
+use std::sync::Arc;
 
 wrap_uniffi_object!(DisplayBitVec, BitVec);
 
@@ -7,7 +7,10 @@ wrap_uniffi_object!(DisplayBitVec, BitVec);
 impl BitVec {
     #[uniffi::constructor]
     pub fn new(size: u64) -> Arc<Self> {
-        Self::internal_new(servicepoint::DisplayBitVec::repeat(false, size as usize))
+        Self::internal_new(servicepoint::DisplayBitVec::repeat(
+            false,
+            size as usize,
+        ))
     }
     #[uniffi::constructor]
     pub fn load(data: Vec<u8>) -> Arc<Self> {

src/containers/brightness_grid.rs

@@ -1,11 +1,6 @@
-use crate::macros::{
+use crate::macros::*;
-    wrap_get_set_fill_2d, wrap_uniffi_object, wrap_width_height,
+use servicepoint::{Brightness, Grid};
-};
+use std::{ops::Deref, sync::Arc};
-use servicepoint::{Brightness, DataRef, Grid};
-use std::{
-    ops::Deref,
-    sync::{Arc, RwLockReadGuard},
-};
 
 wrap_uniffi_object!(BrightnessGrid);
 wrap_width_height!(BrightnessGrid);

src/containers/char_grid.rs

@@ -1,8 +1,6 @@
-use crate::cp437_grid::Cp437Grid;
+use crate::{containers::cp437_grid::Cp437Grid, macros::*};
 use servicepoint::{Grid, SetValueSeriesError};
-use std::convert::Into;
+use std::{convert::Into, sync::Arc};
-use std::sync::{Arc};
-use crate::macros::{wrap_width_height, wrap_uniffi_object};
 
 wrap_uniffi_object!(CharGrid);
 wrap_width_height!(CharGrid);

src/containers/cp437_grid.rs

@@ -1,8 +1,5 @@
-use crate::char_grid::CharGrid;
+use crate::{containers::char_grid::CharGrid, macros::*};
-use crate::macros::{
+use servicepoint::Grid;
-    wrap_get_set_fill_2d, wrap_uniffi_object, wrap_width_height,
-};
-use servicepoint::{DataRef, Grid};
 use std::{ops::Deref, sync::Arc};
 
 wrap_uniffi_object!(Cp437Grid);

src/containers/mod.rs

@@ -0,0 +1,5 @@
+pub mod bitmap;
+pub mod bitvec;
+pub mod brightness_grid;
+pub mod char_grid;
+pub mod cp437_grid;

src/lib.rs

@@ -1,14 +1,11 @@
 uniffi::setup_scaffolding!();
 
-mod bitmap;
-mod bitvec;
 mod brightness;
-mod brightness_grid;
-mod char_grid;
 mod command;
+mod commands;
 mod compression_code;
 mod connection;
 mod constants;
-mod cp437_grid;
+mod containers;
 mod errors;
 mod macros;