X-Git-Url: https://git.jacobcasper.com/?p=xsetrootd.git;a=blobdiff_plain;f=src%2Fmain.rs;fp=src%2Fmain.rs;h=0a5eda3c9ce163d13959383420628f09f8e6d2fa;hp=fd92244c828fa0d01c6c6475cf0b3bc3920225dd;hb=ddaab88fe7468166e8fcad9529bc3931032acc6b;hpb=1e52c28e97aa8e39c001f9e4c6a65ff81c3ea474

diff --git a/src/main.rs b/src/main.rs
index fd92244..0a5eda3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,10 +5,10 @@ use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
-fn update_map(arc_map: Arc<Mutex<HashMap<String, String>>>, key: String, val: String) {
+fn update_map(arc_map: Arc<Mutex<HashMap<String, String>>>, key: &str, val: &str) {
     let clone_arc = arc_map.clone();
     let mut map = clone_arc.lock().unwrap();
-    map.insert(key, val.clone());
+    map.insert(String::from(key), String::from(val));
     for (k, v) in &*map {
         println! {"{}: {}", k.clone(), v.clone()};
     }
@@ -42,20 +42,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                                 // Variant holding a variant that should just be a Vec<&str> I
                                 // believe. This is _the recommended_ way to do this by the author.
                                 let inner_value = value?.as_iter()?.next()?.as_iter()?.next()?;
-                                let artist = String::from(inner_value.as_str()?);
-                                update_map(
-                                    arc_locked_xset_map,
-                                    String::from("artist"),
-                                    String::from(artist),
-                                );
+                                let artist = inner_value.as_str()?;
+                                update_map(arc_locked_xset_map, "artist", artist);
                             }
                             "xesam:title" => {
                                 let title = value?.as_iter()?.next()?.as_str()?;
-                                update_map(
-                                    arc_locked_xset_map,
-                                    String::from("title"),
-                                    String::from(title),
-                                );
+                                update_map(arc_locked_xset_map, "title", title);
                             }
                             _ => (),
                         }