Proper organization

LostQuasar · Jun 13, 2024 · 6855665 · 6855665
1 parent 0787ace
commit 6855665
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/src/rzap/mod.rs → src/api.rs b/src/rzap/mod.rs → src/api.rs
@@ -1,6 +1,4 @@
-pub mod data_type;
-
-use data_type::*;
+use crate::data_type::*;
 use reqwest::header;
 use std::{error::Error, fmt::Debug};
 use strum_macros::EnumString;

diff --git a/src/rzap/data_type.rs → src/data_type.rs b/src/rzap/data_type.rs → src/data_type.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -2,6 +2,5 @@
 //!
 //! A rust library for connecting to an openshock server
 
-pub mod rzap;
-#[cfg(test)]
-mod tests;
+pub mod api;
+pub mod data_type;
diff --git a/src/tests.rs → tests/tests.rs b/src/tests.rs → tests/tests.rs
@@ -1,10 +1,7 @@
 use dotenv::dotenv;
+use rzap::{api::{OpenShockAPI, ShockerSource}, data_type::ControlType};
 use std::hash::{DefaultHasher, Hash, Hasher};
 
-use crate::{
-    rzap::data_type::ControlType,
-    rzap::{OpenShockAPI, ShockerSource},
-};
 
 fn calculate_hash<T: Hash>(t: &T) -> u64 {
     let mut s = DefaultHasher::new();