From 63d8fe2470ce09dc0ef3e75cb2349e50cee29d79 Mon Sep 17 00:00:00 2001
From: JOLIMAITRE Matthieu <matthieu@imagevo.fr>
Date: Mon, 4 Apr 2022 18:42:13 +0300
Subject: [PATCH] better module structure, and added prelude

---
 src/lib/mod.rs | 10 ++++++++++
 src/main.rs    | 12 ++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/lib/mod.rs b/src/lib/mod.rs
index 47aef3d..0cd9c0d 100644
--- a/src/lib/mod.rs
+++ b/src/lib/mod.rs
@@ -7,3 +7,13 @@ pub mod grid_displayer;
 pub fn clear_term() {
 	print!("\x1B[2J\x1B[1;1H");
 }
+
+pub mod prelude {
+	pub use super::controller::{
+		Controller, PlayerController, RandomController, SimulatedController,
+	};
+	pub use super::game::GameError;
+	pub use super::game::Rules as GameRules;
+	pub use super::game_manager::GameManager;
+	pub use super::game_manager::Rules as ManagerRules;
+}
diff --git a/src/main.rs b/src/main.rs
index d8a37a0..cb8169d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,14 +1,10 @@
-use lib::{
-	controller::{player::PlayerController, random::RandomController, Controller},
-	game::{self, GameError},
-	game_manager::{self, GameManager},
-};
-
 pub mod lib;
 
+use lib::prelude::*;
+
 fn main() -> Result<(), GameError> {
-	let game_rules = game::Rules::default().size(8).spawn_per_turn(1);
-	let manager_rules = game_manager::Rules::default();
+	let game_rules = GameRules::default().size(8).spawn_per_turn(1);
+	let manager_rules = ManagerRules::default();
 	let controller = PlayerController::new().into_box();
 	let mut managed = GameManager::new(game_rules, manager_rules, controller);
 	managed.play_all()