cargo fmt

ewilken · Mar 12, 2023 · 5e3e927 · 5e3e927
1 parent 139d9fc
commit 5e3e927
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 29 deletions.
diff --git a/examples/air_purifier.rs b/examples/air_purifier.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, air_purifier::AirPurifierAccessory},
+    accessory::{air_purifier::AirPurifierAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/air_quality_sensor.rs b/examples/air_quality_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, air_quality_sensor::AirQualitySensorAccessory},
+    accessory::{air_quality_sensor::AirQualitySensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/carbon_dioxide_sensor.rs b/examples/carbon_dioxide_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, carbon_dioxide_sensor::CarbonDioxideSensorAccessory},
+    accessory::{carbon_dioxide_sensor::CarbonDioxideSensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/carbon_monoxide_sensor.rs b/examples/carbon_monoxide_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, carbon_monoxide_sensor::CarbonMonoxideSensorAccessory},
+    accessory::{carbon_monoxide_sensor::CarbonMonoxideSensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/contact_sensor.rs b/examples/contact_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, contact_sensor::ContactSensorAccessory},
+    accessory::{contact_sensor::ContactSensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/door.rs b/examples/door.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, door::DoorAccessory},
+    accessory::{door::DoorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/fan.rs b/examples/fan.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, fan::FanAccessory},
+    accessory::{fan::FanAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/fan_v2.rs b/examples/fan_v2.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, fan_v2::FanV2Accessory},
+    accessory::{fan_v2::FanV2Accessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/garage_door_opener.rs b/examples/garage_door_opener.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, garage_door_opener::GarageDoorOpenerAccessory},
+    accessory::{garage_door_opener::GarageDoorOpenerAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/humidity_sensor.rs b/examples/humidity_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, humidity_sensor::HumiditySensorAccessory},
+    accessory::{humidity_sensor::HumiditySensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/leak_sensor.rs b/examples/leak_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, leak_sensor::LeakSensorAccessory},
+    accessory::{leak_sensor::LeakSensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/light_sensor.rs b/examples/light_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, light_sensor::LightSensorAccessory},
+    accessory::{light_sensor::LightSensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/motion_sensor.rs b/examples/motion_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, motion_sensor::MotionSensorAccessory},
+    accessory::{motion_sensor::MotionSensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/occupancy_sensor.rs b/examples/occupancy_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, occupancy_sensor::OccupancySensorAccessory},
+    accessory::{occupancy_sensor::OccupancySensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/outlet.rs b/examples/outlet.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, outlet::OutletAccessory},
+    accessory::{outlet::OutletAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/security_system.rs b/examples/security_system.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, security_system::SecuritySystemAccessory},
+    accessory::{security_system::SecuritySystemAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/smart_speaker.rs b/examples/smart_speaker.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, smart_speaker::SmartSpeakerAccessory},
+    accessory::{smart_speaker::SmartSpeakerAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/smoke_sensor.rs b/examples/smoke_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, smoke_sensor::SmokeSensorAccessory},
+    accessory::{smoke_sensor::SmokeSensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/stateful_programmable_switch.rs b/examples/stateful_programmable_switch.rs
@@ -1,7 +1,11 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, stateful_programmable_switch::StatefulProgrammableSwitchAccessory},
+    accessory::{
+        stateful_programmable_switch::StatefulProgrammableSwitchAccessory,
+        AccessoryCategory,
+        AccessoryInformation,
+    },
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/stateless_programmable_switch.rs b/examples/stateless_programmable_switch.rs
@@ -1,7 +1,11 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, stateless_programmable_switch::StatelessProgrammableSwitchAccessory},
+    accessory::{
+        stateless_programmable_switch::StatelessProgrammableSwitchAccessory,
+        AccessoryCategory,
+        AccessoryInformation,
+    },
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/switch.rs b/examples/switch.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, switch::SwitchAccessory},
+    accessory::{switch::SwitchAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/temperature_sensor.rs b/examples/temperature_sensor.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, temperature_sensor::TemperatureSensorAccessory},
+    accessory::{temperature_sensor::TemperatureSensorAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/thermostat.rs b/examples/thermostat.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, thermostat::ThermostatAccessory},
+    accessory::{thermostat::ThermostatAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/wi_fi_router.rs b/examples/wi_fi_router.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, wi_fi_router::WiFiRouterAccessory},
+    accessory::{wi_fi_router::WiFiRouterAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/wi_fi_satellite.rs b/examples/wi_fi_satellite.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, wi_fi_satellite::WiFiSatelliteAccessory},
+    accessory::{wi_fi_satellite::WiFiSatelliteAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/window.rs b/examples/window.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, window::WindowAccessory},
+    accessory::{window::WindowAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/examples/window_covering.rs b/examples/window_covering.rs
@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{AccessoryCategory, AccessoryInformation, window_covering::WindowCoveringAccessory},
+    accessory::{window_covering::WindowCoveringAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,7 +1,6 @@
 pub use ed25519_dalek::Keypair as Ed25519Keypair;
-//pub use eui48::MacAddress;
-pub use macaddr::MacAddr6 as MacAddress;
 pub use futures;
+pub use macaddr::MacAddr6 as MacAddress;
 pub use serde_json;
 
 pub use crate::{