"clean up" imports, re-export under separate top-level crates

examples/balls/src/main.rs

@@ -3,8 +3,11 @@ use std::path::Path;
 use anyhow::Result;
 use sdl2::keyboard::Scancode;
 
-use libretrogd::utils::rnd_value;
 use libretrogd::*;
+use libretrogd::graphics::*;
+use libretrogd::math::*;
+use libretrogd::system::*;
+use libretrogd::utils::*;
 
 const NUM_BALLS: usize = 128;
 const NUM_BALL_SPRITES: usize = 16;

examples/balls_v2/src/entities.rs

@@ -1,7 +1,9 @@
 use libretrogd::*;
 use libretrogd::entities::*;
 use libretrogd::events::*;
-use libretrogd::utils::rnd_value;
+use libretrogd::graphics::*;
+use libretrogd::math::*;
+use libretrogd::utils::*;
 
 use crate::states::*;
 

examples/balls_v2/src/main.rs

@@ -2,9 +2,8 @@ use std::path::Path;
 
 use anyhow::Result;
 
-use libretrogd::*;
-use libretrogd::events::*;
 use libretrogd::states::*;
+use libretrogd::system::*;
 
 use crate::entities::*;
 use crate::states::*;

examples/balls_v2/src/states.rs

@@ -1,7 +1,11 @@
 use sdl2::keyboard::Scancode;
 
 use libretrogd::entities::*;
+use libretrogd::events::*;
+use libretrogd::graphics::*;
+use libretrogd::math::*;
 use libretrogd::states::*;
+use libretrogd::system::*;
 
 use crate::*;
 

libretrogd/src/graphics/bitmap/blit.rs

@@ -1,4 +1,5 @@
-use crate::{Bitmap, Rect};
+use crate::graphics::*;
+use crate::math::*;
 
 pub enum BlitMethod {
     Solid,

libretrogd/src/graphics/bitmap/iff.rs

@@ -6,8 +6,8 @@ use std::path::Path;
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use thiserror::Error;
 
-use crate::utils::packbits::{pack_bits, unpack_bits, PackBitsError};
-use crate::{Bitmap, Palette, PaletteError, PaletteFormat};
+use crate::graphics::*;
+use crate::utils::packbits::*;
 
 #[derive(Error, Debug)]
 pub enum IffError {

libretrogd/src/graphics/bitmap/mod.rs

@@ -3,11 +3,13 @@ use std::slice;
 
 use thiserror::Error;
 
-pub use crate::blit::*;
-pub use crate::iff::*;
-pub use crate::pcx::*;
-pub use crate::primitives::*;
-use crate::{Palette, Rect};
+use crate::graphics::*;
+use crate::math::*;
+
+pub use self::blit::*;
+pub use self::iff::*;
+pub use self::pcx::*;
+pub use self::primitives::*;
 
 pub mod blit;
 pub mod iff;

libretrogd/src/graphics/bitmap/pcx.rs

@@ -5,8 +5,8 @@ use std::path::Path;
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use thiserror::Error;
 
+use crate::graphics::*;
 use crate::utils::bytes::ReadFixedLengthByteArray;
-use crate::{from_rgb32, Bitmap, Palette, PaletteError, PaletteFormat};
 
 #[derive(Error, Debug)]
 pub enum PcxError {

libretrogd/src/graphics/bitmap/primitives.rs

@@ -1,6 +1,7 @@
 use std::mem::swap;
 
-use crate::{Bitmap, Character, Font, FontRenderOpts, Rect};
+use crate::graphics::*;
+use crate::math::*;
 
 impl Bitmap {
     /// Fills the entire bitmap with the given color.

libretrogd/src/graphics/bitmapatlas.rs

@@ -2,7 +2,8 @@ use std::ops::Index;
 
 use thiserror::Error;
 
-use crate::{Bitmap, Rect};
+use crate::graphics::*;
+use crate::math::*;
 
 #[derive(Error, Debug)]
 pub enum BitmapAtlasError {
@@ -115,7 +116,7 @@ impl Index<usize> for BitmapAtlas {
 
 #[cfg(test)]
 pub mod tests {
-    use claim::assert_matches;
+    use claim::*;
 
     use super::*;
 

libretrogd/src/graphics/font.rs

@@ -5,7 +5,8 @@ use std::path::Path;
 use byteorder::{ReadBytesExt, WriteBytesExt};
 use thiserror::Error;
 
-use crate::{Bitmap, Rect};
+use crate::graphics::*;
+use crate::math::*;
 
 pub static VGA_FONT_BYTES: &[u8] = include_bytes!("../../assets/vga.fnt");
 

libretrogd/src/graphics/mod.rs

@@ -1,4 +1,10 @@
+pub use self::bitmap::*;
+pub use self::bitmapatlas::*;
+pub use self::font::*;
+pub use self::palette::*;
+
 pub mod bitmap;
 pub mod bitmapatlas;
 pub mod font;
 pub mod palette;
+

libretrogd/src/graphics/palette.rs

@@ -7,8 +7,8 @@ use std::path::Path;
 use byteorder::{ReadBytesExt, WriteBytesExt};
 use thiserror::Error;
 
-use crate::utils::abs_diff;
 use crate::NUM_COLORS;
+use crate::utils::abs_diff;
 
 // silly "hack" (???) which allows us to alias the generic constraint `RangeBounds<u8> + Iterator<Item = u8>` to `ColorRange`
 pub trait ColorRange: RangeBounds<u8> + Iterator<Item = u8> {}

libretrogd/src/lib.rs

@@ -1,21 +1,6 @@
 extern crate core;
 extern crate sdl2;
 
-pub use crate::graphics::bitmap::*;
-pub use crate::graphics::bitmapatlas::*;
-pub use crate::graphics::font::*;
-pub use crate::graphics::palette::*;
-pub use crate::graphics::*;
-pub use crate::math::circle::*;
-pub use crate::math::matrix3x3::*;
-pub use crate::math::rect::*;
-pub use crate::math::vector2::*;
-pub use crate::math::*;
-pub use crate::system::input_devices::keyboard::*;
-pub use crate::system::input_devices::mouse::*;
-pub use crate::system::input_devices::*;
-pub use crate::system::*;
-
 pub mod entities;
 pub mod events;
 pub mod graphics;

libretrogd/src/math/circle.rs

@@ -1,4 +1,4 @@
-use crate::{distance_between, distance_squared_between, Vector2};
+use crate::math::*;
 
 /// Represents a 2D circle, using integer center coordinates and radius.
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]

libretrogd/src/math/matrix3x3.rs

@@ -1,6 +1,6 @@
 use std::ops::{Mul, MulAssign};
 
-use crate::{nearly_equal, Vector2};
+use crate::math::*;
 
 /// Represents a 3x3 column-major matrix and provides common methods for matrix math.
 #[derive(Debug, Copy, Clone)]
@@ -284,8 +284,6 @@ impl Mul<Vector2> for Matrix3x3 {
 
 #[cfg(test)]
 pub mod tests {
-    use crate::math::{RADIANS_180, RADIANS_90};
-
     use super::*;
 
     #[test]

libretrogd/src/math/mod.rs

@@ -1,5 +1,10 @@
 use std::ops::{Add, Div, Mul, Sub};
 
+pub use self::circle::*;
+pub use self::matrix3x3::*;
+pub use self::rect::*;
+pub use self::vector2::*;
+
 pub mod circle;
 pub mod matrix3x3;
 pub mod rect;

libretrogd/src/math/vector2.rs

@@ -1,7 +1,6 @@
 use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 
-use crate::Matrix3x3;
-use crate::{angle_between, angle_to_direction, nearly_equal, NearlyEqual};
+use crate::math::*;
 
 /// Represents a 2D vector and provides common methods for vector math.
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -246,8 +245,6 @@ impl MulAssign<Matrix3x3> for Vector2 {
 
 #[cfg(test)]
 pub mod tests {
-    use crate::math::*;
-
     use super::*;
 
     #[test]

libretrogd/src/system/input_devices/keyboard.rs

@@ -1,7 +1,7 @@
 use sdl2::event::Event;
 use sdl2::keyboard::Scancode;
 
-use super::{ButtonState, InputDevice};
+use super::*;
 
 const MAX_KEYS: usize = 256;
 

libretrogd/src/system/input_devices/mouse.rs

@@ -1,8 +1,9 @@
 use sdl2::event::Event;
 
-use crate::{Bitmap, BlitMethod, Rect};
+use crate::graphics::*;
+use crate::math::*;
 
-use super::{ButtonState, InputDevice};
+use super::*;
 
 const MAX_BUTTONS: usize = 32;
 

libretrogd/src/system/mod.rs

@@ -1,12 +1,16 @@
 use byte_slice_cast::AsByteSlice;
+use sdl2::{EventPump, Sdl, TimerSubsystem, VideoSubsystem};
 use sdl2::event::Event;
 use sdl2::pixels::PixelFormatEnum;
 use sdl2::render::{Texture, WindowCanvas};
-use sdl2::{EventPump, Sdl, TimerSubsystem, VideoSubsystem};
 use thiserror::Error;
 
-use crate::{Bitmap, BitmaskFont, InputDevice, Keyboard, Mouse, Palette};
 use crate::{DEFAULT_SCALE_FACTOR, SCREEN_HEIGHT, SCREEN_WIDTH};
+use crate::graphics::*;
+
+pub use self::input_devices::*;
+pub use self::input_devices::keyboard::*;
+pub use self::input_devices::mouse::*;
 
 pub mod input_devices;