Fix logic

Author: syepes

.github/workflows/rust.yml

@@ -73,4 +73,4 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-features -- -D warnings
+          args: --all-features -- -D warnings -A clippy::redundant-clone

src/sio/client.rs

@@ -296,13 +296,11 @@ impl<'a> ClientInfo<'a> {
     let clu_name = match instances.get("System").and_then(|o| o.as_object().and_then(|j| j.get("name")).map(|s| s.to_string().replace('"', ""))) {
       None => {
         warn!("clu_name Not found using clu_id as name");
-        None
+        clu_id.to_string()
       },
-      Some(s) => Some(s),
+      Some(s) => s,
     };
 
-    let clu_name = if let Some(id) = clu_name { id } else { clu_name.unwrap() };
-
     // System
     {
       let mut label: HashMap<&'static str, String> = HashMap::new();

src/sio/metrics.rs

@@ -51,11 +51,10 @@ fn convert_states(instances: &Map<String, serde_json::Value>, relations: &HashMa
   let clu_name = match instances.get("System").and_then(|o| o.as_object().and_then(|j| j.get("name")).map(|s| s.to_string().replace('"', ""))) {
     None => {
       warn!("clu_name Not found using clu_id as name");
-      None
+      clu_id.to_string()
     },
-    Some(s) => Some(s),
+    Some(s) => s,
   };
-  let clu_name = if let Some(id) = clu_name { id } else { clu_name.unwrap() };
 
   // Sdc
   for sdc in instances.get("sdcList").and_then(|v| v.as_array()).unwrap_or_else(|| {