fixup! Organized features for http

rorynugent · Aug 20, 2024 · d00ebdf · d00ebdf
1 parent 28a2257
commit d00ebdf
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/examples/udp.rs b/examples/udp.rs
@@ -1,4 +1,4 @@
-use rtempest::{data::EventType, udp::Tempest};
+use rtempest::{udp::data::EventType, udp::Tempest};
 
 #[tokio::main]
 async fn main() {

diff --git a/examples/udp_subscribe.rs b/examples/udp_subscribe.rs
@@ -1,4 +1,4 @@
-use rtempest::{data::EventType, udp::Tempest};
+use rtempest::{udp::data::EventType, udp::Tempest};
 
 #[tokio::main]
 async fn main() {

diff --git a/src/lib.rs b/src/lib.rs
@@ -17,9 +17,6 @@
 
 #[cfg(feature = "udp")]
 pub mod udp;
-pub mod data;
-pub mod mock;
-pub mod test_common;
 
 #[cfg(feature = "http")]
 pub mod http;
diff --git a/src/udp.rs b/src/udp.rs
@@ -1,6 +1,10 @@
 //! Primary interface for WeatherFlow Tempest weather data over UDP
 
-use crate::data::*;
+pub mod data;
+pub mod mock;
+pub mod test_common;
+
+use crate::udp::data::*;
 use log::trace;
 use serde_json::{Error, Value};
 use std::net::Ipv4Addr;
@@ -824,8 +828,8 @@ impl Tempest {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::mock::MockSender;
-    use crate::test_common::*;
+    use crate::udp::mock::MockSender;
+    use crate::udp::test_common::*;
 
     async fn test_setup(caching: bool) -> (MockSender, Tempest, Receiver<EventType>, u16) {
         let mock = MockSender::bind();

diff --git a/src/data.rs → src/udp/data.rs b/src/data.rs → src/udp/data.rs
diff --git a/src/mock.rs → src/udp/mock.rs b/src/mock.rs → src/udp/mock.rs
diff --git a/src/test_common.rs → src/udp/test_common.rs b/src/test_common.rs → src/udp/test_common.rs
diff --git a/tests/integration_udp.rs b/tests/integration_udp.rs
@@ -1,6 +1,6 @@
-use rtempest::mock::MockSender;
-use rtempest::test_common::*;
-use rtempest::{data::EventType, udp::Tempest};
+use rtempest::udp::mock::MockSender;
+use rtempest::udp::test_common::*;
+use rtempest::{udp::data::EventType, udp::Tempest};
 
 const PORT: u16 = 50222;