Use &str instead of String whenever possible

src/config.rs

@@ -206,7 +206,7 @@ impl Config {
 
 impl Device {
     #[async_recursion]
-    pub async fn create(self, identifier: String, config: &Config, client: AsyncClient) -> Result<DeviceBox, FailedToCreateDevice> {
+    pub async fn create(self, identifier: &str, config: &Config, client: AsyncClient) -> Result<DeviceBox, FailedToCreateDevice> {
         let device: Result<DeviceBox, Error> = match self {
             Device::IkeaOutlet { info, mqtt, kettle } => {
                 trace!(id = identifier, "IkeaOutlet [{} in {:?}]", info.name, info.room);
@@ -229,8 +229,10 @@ impl Device {
             Device::AudioSetup { mqtt, mixer, speakers } => {
                 trace!(id = identifier, "AudioSetup [{}]", identifier);
                 // Create the child devices
-                let mixer = (*mixer).create(identifier.clone() + ".mixer", config, client.clone()).await?;
-                let speakers = (*speakers).create(identifier.clone() + ".speakers", config, client.clone()).await?;
+                let mixer_id = identifier.to_owned() + ".mixer";
+                let mixer = (*mixer).create(&mixer_id, config, client.clone()).await?;
+                let speakers_id = identifier.to_owned() + ".speakers";
+                let speakers = (*speakers).create(&speakers_id, config, client.clone()).await?;
 
                 match AudioSetup::build(&identifier, mqtt, mixer, speakers, client).await {
                     Ok(device) => Ok(Box::new(device)),

src/devices.rs

@@ -27,7 +27,7 @@ impl_cast::impl_cast!(Device, GoogleHomeDevice);
 impl_cast::impl_cast!(Device, OnOff);
 
 pub trait Device: AsGoogleHomeDevice + AsOnMqtt + AsOnPresence + AsOnDarkness + AsOnOff + std::fmt::Debug {
-    fn get_id(&self) -> String;
+    fn get_id(&self) -> &str;
 }
 
 // @TODO Add an inner type that we can wrap with Arc<RwLock<>> to make this type a little bit nicer
@@ -39,12 +39,12 @@ struct Devices {
 macro_rules! get_cast {
     ($trait:ident) => {
         paste::paste! {
-            pub fn [< as_ $trait:snake s >](&mut self) -> HashMap<String, &mut dyn $trait> {
+            pub fn [< as_ $trait:snake s >](&mut self) -> HashMap<&str, &mut dyn $trait> {
                 self.devices
                     .iter_mut()
                     .filter_map(|(id, device)| {
                         if let Some(listener) = [< As $trait >]::cast_mut(device.as_mut()) {
-                            return Some((id.clone(), listener));
+                            return Some((id.as_str(), listener));
                         };
                         return None;
                     }).collect()
@@ -136,7 +136,7 @@ impl Devices {
 
     fn add_device(&mut self, device: DeviceBox) {
         debug!(id = device.get_id(), "Adding device");
-        self.devices.insert(device.get_id(), device);
+        self.devices.insert(device.get_id().to_owned(), device);
     }
 
     get_cast!(OnMqtt);

src/devices/audio_setup.rs

@@ -39,8 +39,8 @@ impl AudioSetup {
 }
 
 impl Device for AudioSetup {
-    fn get_id(&self) -> String {
-        self.identifier.clone()
+    fn get_id(&self) -> &str {
+        &self.identifier
     }
 }
 

src/devices/contact_sensor.rs

@@ -38,8 +38,8 @@ impl ContactSensor {
 }
 
 impl Device for ContactSensor {
-    fn get_id(&self) -> String {
-        self.identifier.clone()
+    fn get_id(&self) -> &str {
+        &self.identifier
     }
 }
 

src/devices/ikea_outlet.rs

@@ -1,5 +1,4 @@
 use std::time::Duration;
-
 use async_trait::async_trait;
 use google_home::errors::ErrorCode;
 use google_home::{GoogleHomeDevice, device, types::Type, traits::{self, OnOff}};
@@ -35,16 +34,16 @@ impl IkeaOutlet {
     }
 }
 
-async fn set_on(client: AsyncClient, topic: String, on: bool) {
+async fn set_on(client: AsyncClient, topic: &str, on: bool) {
     let message = OnOffMessage::new(on);
 
     // @TODO Handle potential errors here
-    client.publish(topic.clone() + "/set", rumqttc::QoS::AtLeastOnce, false, serde_json::to_string(&message).unwrap()).await.map_err(|err| warn!("Failed to update state on {topic}: {err}")).ok();
+    client.publish(topic.to_owned() + "/set", rumqttc::QoS::AtLeastOnce, false, serde_json::to_string(&message).unwrap()).await.map_err(|err| warn!("Failed to update state on {topic}: {err}")).ok();
 }
 
 impl Device for IkeaOutlet {
-    fn get_id(&self) -> String {
-        self.identifier.clone()
+    fn get_id(&self) -> &str {
+        &self.identifier
     }
 }
 
@@ -106,7 +105,7 @@ impl OnMqtt for IkeaOutlet {
                     // @TODO Idealy we would call self.set_on(false), however since we want to do
                     // it after a timeout we have to put it in a seperate task.
                     // I don't think we can really get around calling outside function
-                    set_on(client, topic, false).await;
+                    set_on(client, &topic, false).await;
                 })
             );
         }
@@ -137,7 +136,7 @@ impl GoogleHomeDevice for IkeaOutlet {
         device::Name::new(&self.info.name)
     }
 
-    fn get_id(&self) -> String {
+    fn get_id(&self) -> &str {
         Device::get_id(self)
     }
 
@@ -145,8 +144,8 @@ impl GoogleHomeDevice for IkeaOutlet {
         true
     }
 
-    fn get_room_hint(&self) -> Option<String> {
-        self.info.room.clone()
+    fn get_room_hint(&self) -> Option<&str> {
+        self.info.room.as_deref()
     }
 
     fn will_report_state(&self) -> bool {
@@ -161,7 +160,7 @@ impl traits::OnOff for IkeaOutlet {
     }
 
     fn set_on(&mut self, on: bool) -> Result<(), ErrorCode> {
-        set_on(self.client.clone(), self.mqtt.topic.clone(), on).block_on();
+        set_on(self.client.clone(), &self.mqtt.topic, on).block_on();
 
         Ok(())
     }

src/devices/kasa_outlet.rs

@@ -19,8 +19,8 @@ impl KasaOutlet {
 }
 
 impl Device for KasaOutlet {
-    fn get_id(&self) -> String {
-        self.identifier.clone()
+    fn get_id(&self) -> &str {
+        &self.identifier
     }
 }
 

src/devices/wake_on_lan.rs

@@ -27,8 +27,8 @@ impl WakeOnLAN {
 }
 
 impl Device for WakeOnLAN {
-    fn get_id(&self) -> String {
-        self.identifier.clone()
+    fn get_id(&self) -> &str {
+        &self.identifier
     }
 }
 
@@ -63,7 +63,7 @@ impl GoogleHomeDevice for WakeOnLAN {
         return name;
     }
 
-    fn get_id(&self) -> String {
+    fn get_id(&self) -> &str {
         Device::get_id(self)
     }
 
@@ -71,8 +71,8 @@ impl GoogleHomeDevice for WakeOnLAN {
         true
     }
 
-    fn get_room_hint(&self) -> Option<String> {
-        self.info.room.clone()
+    fn get_room_hint(&self) -> Option<&str> {
+        self.info.room.as_deref()
     }
 }
 

src/main.rs

@@ -79,7 +79,9 @@ async fn app() -> Result<(), Box<dyn std::error::Error>> {
             .clone()
             .into_iter()
             .map(|(identifier, device_config)| async {
-                let device = device_config.create(identifier, &config, client.clone()).await?;
+                // Force the async block to move identifier
+                let identifier = identifier;
+                let device = device_config.create(&identifier, &config, client.clone()).await?;
                 devices.add_device(device).await?;
                 Ok::<(), Box<dyn std::error::Error>>(())
             })