From 59cc150643b13e41c11731db5bf66970645c50be Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Thu, 16 Jun 2022 19:05:54 +0200
Subject: [PATCH] Adds style checking to CI, remove debug code

---
 .drone.yml                        | 7 +++++++
 src/dynamic_data/libraries/mod.rs | 2 +-
 src/dynamic_data/models/mod.rs    | 2 +-
 tests/library_loader.rs           | 5 -----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5f014de..8dad555 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,3 +35,10 @@ steps:
       - cargo llvm-cov nextest --color=always
     depends_on:
       - test-debug-linux
+  - name: check-style
+    image: deukhoofd/linux64builder
+    failure: ignore
+    commands:
+      - cargo fmt --all -- --check
+    depends_on:
+      - test-debug-linux
diff --git a/src/dynamic_data/libraries/mod.rs b/src/dynamic_data/libraries/mod.rs
index cfeb2bf..12358c9 100644
--- a/src/dynamic_data/libraries/mod.rs
+++ b/src/dynamic_data/libraries/mod.rs
@@ -1,5 +1,5 @@
 pub mod battle_stat_calculator;
 pub mod damage_library;
 pub mod dynamic_library;
-pub mod script_resolver;
 pub mod misc_library;
+pub mod script_resolver;
diff --git a/src/dynamic_data/models/mod.rs b/src/dynamic_data/models/mod.rs
index e25c106..7ab2e55 100644
--- a/src/dynamic_data/models/mod.rs
+++ b/src/dynamic_data/models/mod.rs
@@ -7,5 +7,5 @@ pub mod damage_source;
 pub mod executing_move;
 pub mod learned_move;
 pub mod pokemon;
-pub mod pokemon_party;
 pub mod pokemon_builder;
+pub mod pokemon_party;
diff --git a/tests/library_loader.rs b/tests/library_loader.rs
index 2db7b14..d32175a 100644
--- a/tests/library_loader.rs
+++ b/tests/library_loader.rs
@@ -36,17 +36,12 @@ pub fn load_moves(path: &String, type_library: &TypeLibrary) -> MoveLibrary {
     let mut file = File::open(path.to_string() + "Moves.json").unwrap();
     let mut data = String::new();
     file.read_to_string(&mut data).unwrap();
-    println!("1");
     let json: Value = serde_json::from_str(&data).unwrap();
-    println!("a");
     let data = json.as_object().unwrap().get("data").unwrap().as_array().unwrap();
-    println!("this");
     let mut move_library = MoveLibrary::new(data.len());
-    println!("Heeere");
     for move_data in data {
         let move_data = move_data.as_object().unwrap();
         let move_name = StringKey::new(move_data["name"].as_str().unwrap().clone());
-        println!("Loaded move {:?}", move_name);
         let move_type = StringKey::new(move_data["type"].as_str().unwrap());
         let move_type_id = type_library.get_type_id(&move_type);
         let move_category = serde_json::from_value(move_data["category"].clone()).unwrap();