chore: Run rustfmt

Author: qdot

src/bin/main.rs

@@ -49,7 +49,7 @@ pub struct IntifaceCLIArguments {
   #[argh(option)]
   #[getset(get = "pub")]
   websocket_client_address: Option<String>,
-  
+
   // Options that set up communications with intiface GUI
   /// if passed, output json for parent process via websockets
   #[argh(option)]
@@ -146,7 +146,6 @@ pub struct IntifaceCLIArguments {
   #[getset(get = "pub")]
   mdns_suffix: Option<String>,
 
-
   #[cfg(debug_assertions)]
   /// crash the main thread (that holds the runtime)
   #[argh(switch)]

src/device_communication_managers.rs

@@ -17,9 +17,9 @@ pub fn setup_server_device_comm_managers(
   if args.use_bluetooth_le() {
     info!("Including Bluetooth LE (btleplug) Device Comm Manager Support");
     let mut command_manager_builder = BtlePlugCommunicationManagerBuilder::default();
-    #[cfg(target_os="ios")]
+    #[cfg(target_os = "ios")]
     command_manager_builder.requires_keepalive(true);
-    #[cfg(not(target_os="ios"))]
+    #[cfg(not(target_os = "ios"))]
     command_manager_builder.requires_keepalive(false);
     server_builder.comm_manager(command_manager_builder);
   }
@@ -30,10 +30,10 @@ pub fn setup_server_device_comm_managers(
   #[cfg(not(any(target_os = "android", target_os = "ios")))]
   {
     use buttplug::server::device::hardware::communication::{
+      hid::HidCommunicationManagerBuilder,
       lovense_dongle::{
         LovenseHIDDongleCommunicationManagerBuilder, LovenseSerialDongleCommunicationManagerBuilder,
       },
-      hid::HidCommunicationManagerBuilder,
       serialport::SerialPortCommunicationManagerBuilder,
     };
     if args.use_lovense_dongle_hid() {

src/engine.rs

@@ -8,20 +8,17 @@ use crate::{
   },
   logging::setup_frontend_logging,
   options::EngineOptions,
-  IntifaceError,
-  ButtplugRemoteServer,
-  ButtplugServerConnectorError
+  ButtplugRemoteServer, ButtplugServerConnectorError, IntifaceError,
 };
 use buttplug::{
   core::{
     connector::{
-      ButtplugRemoteServerConnector,
-      ButtplugWebsocketClientTransport,
+      ButtplugRemoteServerConnector, ButtplugWebsocketClientTransport,
       ButtplugWebsocketServerTransportBuilder,
     },
     message::serializer::ButtplugServerJSONSerializer,
   },
-  server::{ButtplugServerBuilder},
+  server::ButtplugServerBuilder,
 };
 use once_cell::sync::OnceCell;
 use std::{str::FromStr, sync::Arc, time::Duration};
@@ -113,7 +110,7 @@ async fn run_server(
         _,
         ButtplugServerJSONSerializer,
       >::new(
-        ButtplugWebsocketClientTransport::new_insecure_connector(&addr)
+        ButtplugWebsocketClientTransport::new_insecure_connector(&addr),
       ))
       .await
   } else {
@@ -136,7 +133,7 @@ impl IntifaceEngine {
     &self,
     options: &EngineOptions,
     external_frontend: Option<Arc<dyn Frontend>>,
-    skip_logging_setup: bool
+    skip_logging_setup: bool,
   ) -> Result<(), IntifaceEngineError> {
     // At this point we will have received and validated options.
 
@@ -205,7 +202,13 @@ impl IntifaceEngine {
     let stop_child_token = self.stop_token.child_token();
     let options_clone = options.clone();
     tokio::spawn(async move {
-      frontend_server_event_loop(&options_clone, event_receiver, frontend_clone, stop_child_token).await;
+      frontend_server_event_loop(
+        &options_clone,
+        event_receiver,
+        frontend_clone,
+        stop_child_token,
+      )
+      .await;
     });
 
     loop {

src/frontend/mod.rs

@@ -1,20 +1,20 @@
 pub mod process_messages;
 mod websocket_frontend;
+use crate::remote_server::ButtplugRemoteServerEvent;
 use crate::{error::IntifaceError, options::EngineOptions};
 use async_trait::async_trait;
-use crate::remote_server::ButtplugRemoteServerEvent;
 use futures::{pin_mut, Stream, StreamExt};
+use mdns_sd::{ServiceDaemon, ServiceInfo};
 pub use process_messages::{EngineMessage, IntifaceMessage};
+use rand::distributions::{Alphanumeric, DistString};
+use std::collections::HashMap;
 use std::sync::Arc;
 use tokio::{
   select,
   sync::{broadcast, Notify},
 };
 use tokio_util::sync::CancellationToken;
 use websocket_frontend::WebsocketFrontend;
-use mdns_sd::{ServiceDaemon, ServiceInfo};
-use std::collections::HashMap;
-use rand::distributions::{Alphanumeric, DistString};
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -75,25 +75,37 @@ pub async fn frontend_server_event_loop(
   let mut mdns = None;
 
   if options.broadcast_server_mdns() {
-  // Create a daemon
+    // Create a daemon
     let mdns_daemon = ServiceDaemon::new().expect("Failed to create daemon");
 
     // Create a service info.
     let service_type = "_intiface_engine._tcp.local.";
     let random_suffix = Alphanumeric.sample_string(&mut rand::thread_rng(), 6);
-    let instance_name = format!("intiface_engine_{}_{}", options.mdns_suffix().as_ref().unwrap_or(&"".to_owned()).to_owned(), random_suffix);
-    info!("Bringing up mDNS Advertisment using instance name {}", instance_name);
+    let instance_name = format!(
+      "intiface_engine_{}_{}",
+      options
+        .mdns_suffix()
+        .as_ref()
+        .unwrap_or(&"".to_owned())
+        .to_owned(),
+      random_suffix
+    );
+    info!(
+      "Bringing up mDNS Advertisment using instance name {}",
+      instance_name
+    );
     let host_name = format!("{}.local.", instance_name);
     let port = options.websocket_port().unwrap_or(12345);
-    let properties:HashMap<String, String> = HashMap::new();
+    let properties: HashMap<String, String> = HashMap::new();
     let mut my_service = ServiceInfo::new(
       service_type,
       &instance_name,
       &host_name,
       "",
       port,
-      properties
-    ).unwrap();
+      properties,
+    )
+    .unwrap();
     my_service = my_service.enable_addr_auto();
     mdns_daemon.register(my_service).unwrap();
     mdns = Some(mdns_daemon);

src/frontend/process_messages.rs

@@ -1,4 +1,4 @@
-use buttplug::{util::device_configuration::UserConfigDeviceIdentifier};
+use buttplug::util::device_configuration::UserConfigDeviceIdentifier;
 use serde::{Deserialize, Serialize};
 
 // Everything in this struct is an object, even if it has null contents. This is to make other

src/lib.rs

@@ -14,4 +14,4 @@ pub use error::*;
 pub use frontend::{EngineMessage, Frontend, IntifaceMessage};
 pub use logging::{setup_console_logging, setup_frontend_logging, BroadcastWriter};
 pub use options::{EngineOptions, EngineOptionsBuilder, EngineOptionsExternal};
-pub use remote_server::{ButtplugRemoteServer, ButtplugServerConnectorError};
+pub use remote_server::{ButtplugRemoteServer, ButtplugServerConnectorError};

src/options.rs

@@ -84,7 +84,7 @@ pub struct EngineOptionsExternal {
   pub crash_main_thread: bool,
   pub crash_task_thread: bool,
   pub broadcast_server_mdns: bool,
-  pub mdns_suffix: Option<String>
+  pub mdns_suffix: Option<String>,
 }
 
 impl From<EngineOptionsExternal> for EngineOptions {
@@ -115,7 +115,7 @@ impl From<EngineOptionsExternal> for EngineOptions {
       crash_main_thread: other.crash_main_thread,
       crash_task_thread: other.crash_task_thread,
       broadcast_server_mdns: other.broadcast_server_mdns,
-      mdns_suffix: other.mdns_suffix
+      mdns_suffix: other.mdns_suffix,
     }
   }
 }

src/remote_server.rs

@@ -65,7 +65,7 @@ async fn run_device_event_stream(
 ) {
   let server_receiver = server.event_stream();
   pin_mut!(server_receiver);
-  loop { 
+  loop {
     match server_receiver.next().await {
       None => {
         info!("Server disconnected via server disappearance, exiting loop.");