Rustfmt

zehnm · zehnm · commit 1d54f4dad65e · 2025-09-09T19:24:23.000+02:00
diff --git a/src/client/actor.rs b/src/client/actor.rs
@@ -6,8 +6,8 @@
 use actix::{Actor, Context};
 use log::debug;
 
-use crate::client::messages::{ConnectionEvent, ConnectionState};
 use crate::client::HomeAssistantClient;
+use crate::client::messages::{ConnectionEvent, ConnectionState};
 
 impl Actor for HomeAssistantClient {
     type Context = Context<Self>;
diff --git a/src/client/close_handler.rs b/src/client/close_handler.rs
@@ -10,8 +10,8 @@ use actix_web_actors::ws;
 use awc::ws::CloseReason;
 use log::info;
 
-use crate::client::messages::Close;
 use crate::client::HomeAssistantClient;
+use crate::client::messages::Close;
 
 impl Handler<Close> for HomeAssistantClient {
     type Result = ();
diff --git a/src/client/entity/button.rs b/src/client/entity/button.rs
@@ -6,8 +6,8 @@
 use crate::errors::ServiceError;
 use serde_json::{Map, Value};
 use std::collections::HashMap;
-use uc_api::intg::AvailableIntgEntity;
 use uc_api::EntityType;
+use uc_api::intg::AvailableIntgEntity;
 
 pub(crate) fn convert_button_entity(
     entity_id: String,
diff --git a/src/client/entity/climate.rs b/src/client/entity/climate.rs
@@ -166,9 +166,9 @@ pub(crate) fn convert_climate_entity(
 mod tests {
     use crate::client::entity::climate_event_to_entity_change;
     use crate::client::model::EventData;
-    use serde_json::{json, Value};
-    use uc_api::intg::EntityChange;
+    use serde_json::{Value, json};
     use uc_api::EntityType;
+    use uc_api::intg::EntityChange;
 
     #[test]
     fn climate_event_heat() {
diff --git a/src/client/entity/light.rs b/src/client/entity/light.rs
@@ -11,7 +11,7 @@ use log::warn;
 use serde_json::{Map, Value};
 use std::collections::HashMap;
 use uc_api::intg::AvailableIntgEntity;
-use uc_api::{intg::EntityChange, EntityType, LightFeature};
+use uc_api::{EntityType, LightFeature, intg::EntityChange};
 
 pub(crate) fn map_light_attributes(
     entity_id: &str,
diff --git a/src/client/entity/remote.rs b/src/client/entity/remote.rs
@@ -8,8 +8,8 @@ use crate::client::model::EventData;
 use crate::errors::ServiceError;
 use serde_json::{Map, Value};
 use std::collections::HashMap;
-use uc_api::intg::{AvailableIntgEntity, EntityChange, IntgRemoteFeature};
 use uc_api::EntityType;
+use uc_api::intg::{AvailableIntgEntity, EntityChange, IntgRemoteFeature};
 
 pub(crate) fn remote_event_to_entity_change(
     mut data: EventData,
diff --git a/src/client/entity/switch.rs b/src/client/entity/switch.rs
@@ -6,7 +6,7 @@
 use serde_json::{Map, Value};
 use std::collections::HashMap;
 use uc_api::intg::AvailableIntgEntity;
-use uc_api::{intg::EntityChange, EntityType};
+use uc_api::{EntityType, intg::EntityChange};
 
 use crate::client::event::convert_ha_onoff_state;
 use crate::client::model::EventData;
diff --git a/src/client/event.rs b/src/client/event.rs
@@ -6,10 +6,10 @@
 //! See <https://developers.home-assistant.io/docs/api/websocket/#subscribe-to-events> for further
 //! information.
 
+use crate::client::HomeAssistantClient;
 use crate::client::entity::*;
 use crate::client::messages::EntityEvent;
 use crate::client::model::Event;
-use crate::client::HomeAssistantClient;
 use crate::errors::ServiceError;
 use log::debug;
 
diff --git a/src/client/get_entities.rs b/src/client/get_entities.rs
@@ -3,8 +3,8 @@
 
 //! Actix actor handler implementation for the `GetStates` message
 
-use crate::client::messages::GetAvailableEntities;
 use crate::client::HomeAssistantClient;
+use crate::client::messages::GetAvailableEntities;
 use crate::errors::ServiceError;
 use actix::Handler;
 use log::debug;
diff --git a/src/client/get_states.rs b/src/client/get_states.rs
@@ -5,15 +5,15 @@
 
 use std::str::FromStr;
 
+use crate::client::HomeAssistantClient;
 use crate::client::entity::*;
 use crate::client::messages::GetStates;
-use crate::client::HomeAssistantClient;
 use crate::errors::ServiceError;
 use actix::Handler;
 use log::{debug, error, info, warn};
-use serde_json::{json, Value};
-use uc_api::intg::AvailableIntgEntity;
+use serde_json::{Value, json};
 use uc_api::EntityType;
+use uc_api::intg::AvailableIntgEntity;
 
 impl Handler<GetStates> for HomeAssistantClient {
     type Result = Result<(), ServiceError>;
diff --git a/src/client/service/button.rs b/src/client/service/button.rs
@@ -6,8 +6,8 @@
 use crate::client::service::cmd_from_str;
 use crate::errors::ServiceError;
 use serde_json::Value;
-use uc_api::intg::EntityCommand;
 use uc_api::ButtonCommand;
+use uc_api::intg::EntityCommand;
 
 pub(crate) fn handle_button(msg: &EntityCommand) -> Result<(String, Option<Value>), ServiceError> {
     let cmd: ButtonCommand = cmd_from_str(&msg.cmd_id)?;
diff --git a/src/client/service/climate.rs b/src/client/service/climate.rs
@@ -6,9 +6,9 @@
 use crate::client::service::{cmd_from_str, get_required_params};
 use crate::errors::ServiceError;
 use crate::util::json::copy_entry;
-use serde_json::{json, Map, Value};
-use uc_api::intg::EntityCommand;
+use serde_json::{Map, Value, json};
 use uc_api::ClimateCommand;
+use uc_api::intg::EntityCommand;
 
 pub(crate) fn handle_climate(msg: &EntityCommand) -> Result<(String, Option<Value>), ServiceError> {
     let cmd: ClimateCommand = cmd_from_str(&msg.cmd_id)?;
@@ -66,7 +66,7 @@ pub(crate) fn handle_climate(msg: &EntityCommand) -> Result<(String, Option<Valu
 mod tests {
     use crate::client::service::climate::handle_climate;
     use rstest::rstest;
-    use serde_json::{json, Value};
+    use serde_json::{Value, json};
     use uc_api::intg::EntityCommand;
 
     #[test]
diff --git a/src/client/service/media_player.rs b/src/client/service/media_player.rs
@@ -5,9 +5,9 @@
 
 use crate::client::service::{cmd_from_str, get_required_params};
 use crate::errors::ServiceError;
-use serde_json::{json, Map, Value};
-use uc_api::intg::EntityCommand;
+use serde_json::{Map, Value, json};
 use uc_api::MediaPlayerCommand;
+use uc_api::intg::EntityCommand;
 
 pub fn handle_media_player(msg: &EntityCommand) -> Result<(String, Option<Value>), ServiceError> {
     let cmd: MediaPlayerCommand = cmd_from_str(&msg.cmd_id)?;
@@ -50,7 +50,7 @@ pub fn handle_media_player(msg: &EntityCommand) -> Result<(String, Option<Value>
         MediaPlayerCommand::FastForward
         | MediaPlayerCommand::Rewind
         | MediaPlayerCommand::MuteToggle => {
-            return Err(ServiceError::BadRequest("Not supported".into()))
+            return Err(ServiceError::BadRequest("Not supported".into()));
         }
         MediaPlayerCommand::Mute => (
             "volume_mute".into(),
@@ -121,7 +121,7 @@ pub fn handle_media_player(msg: &EntityCommand) -> Result<(String, Option<Value>
         | MediaPlayerCommand::Subtitle
         | MediaPlayerCommand::ContextMenu
         | MediaPlayerCommand::Settings => {
-            return Err(ServiceError::BadRequest("Not supported".into()))
+            return Err(ServiceError::BadRequest("Not supported".into()));
         }
         MediaPlayerCommand::SelectSource => {
             let mut data = Map::new();
@@ -157,9 +157,9 @@ mod tests {
     use crate::client::service::media_player::handle_media_player;
     use crate::errors::ServiceError;
     use rstest::rstest;
-    use serde_json::{json, Map, Value};
-    use uc_api::intg::EntityCommand;
+    use serde_json::{Map, Value, json};
     use uc_api::EntityType;
+    use uc_api::intg::EntityCommand;
 
     fn new_entity_command(cmd_id: impl Into<String>, params: Value) -> EntityCommand {
         EntityCommand {
diff --git a/src/client/service/mod.rs b/src/client/service/mod.rs
@@ -7,15 +7,15 @@
 //! See <https://developers.home-assistant.io/docs/api/websocket/#calling-a-service> for further
 //! information.
 
+use crate::client::HomeAssistantClient;
 use crate::client::messages::CallService;
 use crate::client::model::{CallServiceMsg, Target};
-use crate::client::HomeAssistantClient;
 use crate::errors::ServiceError;
 use actix::Handler;
 use log::info;
 use serde_json::{Map, Value};
-use uc_api::intg::EntityCommand;
 use uc_api::EntityType;
+use uc_api::intg::EntityCommand;
 
 mod button;
 mod climate;
diff --git a/src/client/service/switch.rs b/src/client/service/switch.rs
@@ -6,8 +6,8 @@
 use crate::client::service::cmd_from_str;
 use crate::errors::ServiceError;
 use serde_json::Value;
-use uc_api::intg::EntityCommand;
 use uc_api::SwitchCommand;
+use uc_api::intg::EntityCommand;
 
 pub(crate) fn handle_switch(msg: &EntityCommand) -> Result<(String, Option<Value>), ServiceError> {
     let cmd: SwitchCommand = cmd_from_str(&msg.cmd_id)?;
diff --git a/src/client/set_remote_id.rs b/src/client/set_remote_id.rs
@@ -3,8 +3,8 @@
 
 //! Actix actor handler implementation for the `SetRemoteId` message
 
-use crate::client::messages::SetRemoteId;
 use crate::client::HomeAssistantClient;
+use crate::client::messages::SetRemoteId;
 use crate::errors::ServiceError;
 use actix::Handler;
 use log::debug;
diff --git a/src/client/streamhandler.rs b/src/client/streamhandler.rs
@@ -7,8 +7,8 @@ use actix::{ActorContext, AsyncContext, Context, StreamHandler};
 use actix_web_actors::ws::{Frame, ProtocolError as WsProtocolError};
 use log::{debug, error, info};
 
-use crate::client::messages::Close;
 use crate::client::HomeAssistantClient;
+use crate::client::messages::Close;
 
 impl StreamHandler<Result<Frame, WsProtocolError>> for HomeAssistantClient {
     fn handle(&mut self, msg: Result<Frame, WsProtocolError>, ctx: &mut Self::Context) {
diff --git a/src/client/subscribed_entities.rs b/src/client/subscribed_entities.rs
@@ -1,5 +1,5 @@
-use crate::client::messages::SubscribedEntities;
 use crate::client::HomeAssistantClient;
+use crate::client::messages::SubscribedEntities;
 use actix::Handler;
 use log::debug;
 
diff --git a/src/configuration.rs b/src/configuration.rs
@@ -3,11 +3,11 @@
 
 //! Configuration file handling.
 
-use crate::errors::ServiceError;
 use crate::APP_VERSION;
+use crate::errors::ServiceError;
 use config::Config;
 use log::{error, info, warn};
-use serde_with::{serde_as, DurationMilliSeconds, DurationSeconds};
+use serde_with::{DurationMilliSeconds, DurationSeconds, serde_as};
 use std::collections::HashMap;
 use std::fmt::{Display, Formatter};
 use std::path::{Path, PathBuf};
@@ -376,7 +376,7 @@ fn check_cfg_values(mut settings: Settings) -> Result<Settings, config::ConfigEr
             return Err(config::ConfigError::Message(format!(
                 "invalid scheme in home_assistant.url: {}. Valid: [ws, wss]",
                 scheme
-            )))
+            )));
         }
     }
 
diff --git a/src/controller/handler/r2_event.rs b/src/controller/handler/r2_event.rs
@@ -7,8 +7,8 @@ use crate::controller::handler::{AbortDriverSetup, ConnectMsg, DisconnectMsg};
 use crate::controller::{Controller, R2EventMsg};
 use actix::{AsyncContext, Handler};
 use log::error;
-use uc_api::intg::ws::R2Event;
 use uc_api::intg::DeviceState;
+use uc_api::intg::ws::R2Event;
 
 impl Handler<R2EventMsg> for Controller {
     type Result = ();
diff --git a/src/controller/handler/r2_request.rs b/src/controller/handler/r2_request.rs
@@ -3,6 +3,7 @@
 
 //! Actix message handler for [R2RequestMsg].
 
+use crate::APP_VERSION;
 use crate::built_info;
 use crate::client::messages::{CallService, GetAvailableEntities, GetStates};
 use crate::configuration::get_driver_metadata;
@@ -11,12 +12,11 @@ use crate::controller::handler::{
 };
 use crate::controller::{Controller, OperationModeInput, R2RequestMsg, SendWsMessage};
 use crate::errors::ServiceError;
-use crate::util::{return_fut_err, return_fut_ok, DeserializeMsgData};
-use crate::APP_VERSION;
-use actix::{fut, AsyncContext, Handler, ResponseFuture};
+use crate::util::{DeserializeMsgData, return_fut_err, return_fut_ok};
+use actix::{AsyncContext, Handler, ResponseFuture, fut};
 use lazy_static::lazy_static;
 use log::{debug, error};
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 use strum::EnumMessage;
 use uc_api::intg::ws::{AvailableEntitiesMsgData, DriverVersionMsgData, R2Request};
 use uc_api::intg::{EntityCommand, IntegrationVersion};
diff --git a/src/controller/mod.rs b/src/controller/mod.rs
@@ -9,7 +9,7 @@ mod messages;
 pub use messages::*;
 
 use crate::client::HomeAssistantClient;
-use crate::configuration::{Settings, DEF_SETUP_TIMEOUT_SEC, ENV_SETUP_TIMEOUT};
+use crate::configuration::{DEF_SETUP_TIMEOUT_SEC, ENV_SETUP_TIMEOUT, Settings};
 use crate::controller::handler::AbortDriverSetup;
 use crate::errors::ServiceError;
 use crate::util::new_websocket_client;
diff --git a/src/errors.rs b/src/errors.rs
@@ -3,8 +3,8 @@
 
 //! Custom application error with conversions from common Rust and 3rd-party errors.
 
-use actix::dev::SendError;
 use actix::MailboxError;
+use actix::dev::SendError;
 use derive_more::Display;
 use log::error;
 use std::io::ErrorKind;
diff --git a/src/main.rs b/src/main.rs
@@ -16,22 +16,22 @@
 #![deny(unsafe_code)]
 
 use crate::configuration::{
-    get_configuration, CertificateSettings, IntegrationSettings, ENV_DISABLE_MDNS_PUBLISH,
+    CertificateSettings, ENV_DISABLE_MDNS_PUBLISH, IntegrationSettings, get_configuration,
 };
 use crate::controller::Controller;
 use crate::server::publish_service;
 use crate::util::{bool_from_env, create_single_cert_server_config};
 use actix::Actor;
-use actix_web::{middleware, web, App, HttpServer};
-use clap::{arg, Command};
+use actix_web::{App, HttpServer, middleware, web};
+use clap::{Command, arg};
 use configuration::DEF_CONFIG_FILE;
 use log::{error, info};
 use std::io;
 use std::net::TcpListener;
 use std::path::Path;
 use uc_api::intg::IntegrationDriverUpdate;
 use uc_api::util::text_from_language_map;
-use uc_intg_hass::{built_info, APP_VERSION};
+use uc_intg_hass::{APP_VERSION, built_info};
 
 mod client;
 mod configuration;
diff --git a/src/server/ws/connection.rs b/src/server/ws/connection.rs
@@ -7,8 +7,8 @@ use crate::controller::{NewR2Session, R2SessionDisconnect, SendWsMessage};
 use crate::errors::ServiceError;
 use crate::server::ws::WsConn;
 use actix::{
-    fut, Actor, ActorContext, ActorFutureExt, AsyncContext, ContextFutureSpawner, Handler,
-    ResponseActFuture, Running, StreamHandler, WrapFuture,
+    Actor, ActorContext, ActorFutureExt, AsyncContext, ContextFutureSpawner, Handler,
+    ResponseActFuture, Running, StreamHandler, WrapFuture, fut,
 };
 use actix_web_actors::ws::{CloseCode, CloseReason, Message, ProtocolError, WebsocketContext};
 use bytestring::ByteString;
diff --git a/src/server/ws/events.rs b/src/server/ws/events.rs
@@ -3,10 +3,10 @@
 
 //! Handle events from Remote Two
 
+use crate::Controller;
 use crate::controller::R2EventMsg;
 use crate::errors::ServiceError;
 use crate::server::ws::WsConn;
-use crate::Controller;
 use actix::Addr;
 use log::{error, info, warn};
 use std::str::FromStr;
diff --git a/src/server/ws/mod.rs b/src/server/ws/mod.rs
@@ -3,11 +3,11 @@
 
 //! WebSocket server for the Remote Two integration API
 
-use crate::configuration::{HeartbeatSettings, WebSocketSettings, ENV_API_MSG_TRACING};
 use crate::Controller;
+use crate::configuration::{ENV_API_MSG_TRACING, HeartbeatSettings, WebSocketSettings};
 use actix::Addr;
 use actix_web::error::JsonPayloadError;
-use actix_web::{error, get, web, Error, HttpRequest, HttpResponse};
+use actix_web::{Error, HttpRequest, HttpResponse, error, get, web};
 use log::{debug, info};
 use std::env;
 use std::time::Instant;
diff --git a/src/server/ws/requests.rs b/src/server/ws/requests.rs
@@ -3,10 +3,10 @@
 
 //! Handle request messages from Remote Two
 
+use crate::Controller;
 use crate::controller::R2RequestMsg;
 use crate::errors::ServiceError;
 use crate::server::ws::WsConn;
-use crate::Controller;
 use actix::Addr;
 use log::{debug, warn};
 use std::str::FromStr;
diff --git a/src/server/ws/responses.rs b/src/server/ws/responses.rs
diff --git a/src/util/json.rs b/src/util/json.rs
