Restructure data modules

build.rs

@@ -1,14 +1,14 @@
-#[path = "src/data/structs.rs"]
-mod structs;
+#[path = "src/data/skill_def.rs"]
+mod skill_def;
 
 use proc_macro2::TokenStream;
 use quote::{quote, ToTokens};
+use skill_def::SkillDef;
 use std::{
     env,
     fs::{self, File},
     path::PathBuf,
 };
-use structs::SkillDef;
 use winresource::WindowsResource;
 
 fn main() {

src/data/mod.rs

@@ -1,12 +1,10 @@
 mod buff;
 mod condi;
-mod skill;
-mod structs;
+mod skill_def;
+mod skill_info;
+mod skill_names;
 
-pub use self::buff::*;
-pub use self::condi::*;
-pub use self::skill::*;
-pub use self::structs::*;
+pub use self::{buff::*, condi::*, skill_def::*, skill_info::*, skill_names::*};
 
 use std::{
     collections::HashMap,

src/data/skill_def.rs

@@ -0,0 +1,37 @@
+use serde::{Deserialize, Serialize};
+
+// TODO: allow name override?
+// TODO: instead of hits allow counting buff apply?
+// TODO: support instant casts with buff apply?
+
+/// Skill definition parsed from a file.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SkillDef {
+    /// Skill id.
+    pub id: u32,
+
+    /// Whether the definition is active.
+    #[serde(default = "default_as_true")]
+    pub enabled: bool,
+
+    /// Additional hit skill ids.
+    #[serde(default)]
+    pub hit_ids: Vec<u32>,
+
+    /// Total amount of hits.
+    pub hits: Option<usize>,
+
+    /// Minimum amount of hits expected.
+    pub expected: Option<usize>,
+
+    /// Maximum duration (ms) to count as one cast.
+    pub max_duration: Option<i32>,
+
+    /// Whether to include minion hits.
+    #[serde(default)]
+    pub minion: bool,
+}
+
+fn default_as_true() -> bool {
+    true
+}

src/data/structs.rs → src/data/skill_info.rs

@@ -1,8 +1,4 @@
-use serde::{Deserialize, Serialize};
-
-// TODO: allow name override?
-// TODO: instead of hits allow counting buff apply?
-// TODO: support instant casts with buff apply?
+use super::SkillDef;
 
 /// Extra error margin for max duration.
 const DURATION_EPSILON: i32 = 500;
@@ -58,7 +54,6 @@ pub struct SkillHits {
     pub expected: usize,
 }
 
-#[allow(dead_code)] // TODO: cargo/clippy complain despite these being used in cast log?
 impl SkillHits {
     pub fn has_hits(&self) -> bool {
         self.max > 0
@@ -99,35 +94,3 @@ pub enum SkillHitCount {
     Max,
     OverMax,
 }
-
-/// Skill definition parsed from a file.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SkillDef {
-    /// Skill id.
-    pub id: u32,
-
-    /// Whether the definition is active.
-    #[serde(default = "default_as_true")]
-    pub enabled: bool,
-
-    /// Additional hit skill ids.
-    #[serde(default)]
-    pub hit_ids: Vec<u32>,
-
-    /// Total amount of hits.
-    pub hits: Option<usize>,
-
-    /// Minimum amount of hits expected.
-    pub expected: Option<usize>,
-
-    /// Maximum duration (ms) to count as one cast.
-    pub max_duration: Option<i32>,
-
-    /// Whether to include minion hits.
-    #[serde(default)]
-    pub minion: bool,
-}
-
-fn default_as_true() -> bool {
-    true
-}