Moved traits into seperate module

src/devices/audio_setup.rs

@@ -4,11 +4,14 @@ use rumqttc::AsyncClient;
 use serde::Deserialize;
 use tracing::{debug, error, trace, warn};
 
-use crate::config::{self, CreateDevice, MqttDeviceConfig};
-use crate::error::CreateDeviceError;
-use crate::event::EventChannel;
-use crate::mqtt::{OnMqtt, RemoteAction, RemoteMessage};
-use crate::presence::OnPresence;
+use crate::{
+    config::{self, CreateDevice, MqttDeviceConfig},
+    error::CreateDeviceError,
+    event::EventChannel,
+    mqtt::{RemoteAction, RemoteMessage},
+    traits::OnMqtt,
+    traits::OnPresence,
+};
 
 use super::{As, Device};
 

src/devices/contact_sensor.rs

@@ -10,8 +10,10 @@ use crate::{
     config::{CreateDevice, MqttDeviceConfig},
     error::{CreateDeviceError, MissingWildcard},
     event::EventChannel,
-    mqtt::{ContactMessage, OnMqtt, PresenceMessage},
-    presence::{self, OnPresence},
+    mqtt::{ContactMessage, PresenceMessage},
+    presence,
+    traits::OnMqtt,
+    traits::OnPresence,
 };
 
 use super::Device;

src/devices/ikea_outlet.rs

@@ -17,8 +17,9 @@ use crate::config::{CreateDevice, InfoConfig, MqttDeviceConfig};
 use crate::devices::Device;
 use crate::error::CreateDeviceError;
 use crate::event::EventChannel;
-use crate::mqtt::{OnMqtt, OnOffMessage};
-use crate::presence::OnPresence;
+use crate::mqtt::OnOffMessage;
+use crate::traits::OnMqtt;
+use crate::traits::OnPresence;
 
 #[derive(Debug, Clone, Deserialize, PartialEq, Eq, Copy)]
 pub enum OutletType {

src/devices/wake_on_lan.rs

@@ -17,7 +17,8 @@ use crate::{
     config::{CreateDevice, InfoConfig, MqttDeviceConfig},
     error::CreateDeviceError,
     event::EventChannel,
-    mqtt::{ActivateMessage, OnMqtt},
+    mqtt::ActivateMessage,
+    traits::OnMqtt,
 };
 
 use super::Device;