Clippy

Signed-off-by: Sebastian Schildt <sebastian.schildt@de.bosch.com>
boschglobal · Oct 20, 2024 · b2ec135 · b2ec135
1 parent 6ec0aef
commit b2ec135
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/kuksa-persistence-provider/src/kuksaconnector.rs b/kuksa-persistence-provider/src/kuksaconnector.rs
@@ -1,8 +1,5 @@
 use crate::storage;
 
-use regex;
-use prost_types::Timestamp;
-
 use std::time::SystemTime;
 use std::collections::HashMap;
 
@@ -11,7 +8,6 @@ use kuksa::proto as proto;
 //use kuksa::proto::v1::{datapoint::Value, DataType, Datapoint};
 
 use std::sync::{Arc, Mutex};
-use log;
 
 #[derive(Debug)]
 pub struct ParseError {}
@@ -31,7 +27,7 @@ pub async fn get_from_storage_and_set(storage: &impl storage::Storage, kuksa_cli
             log::warn!("No value for VSS signal: {} stored", vsspath);
             return;
         }
-    };
+    }; 
 
     /*
     let data_value = try_into_data_value(
@@ -68,7 +64,6 @@ pub async fn get_from_storage_and_set(storage: &impl storage::Storage, kuksa_cli
             log::warn!("Error: Could not set value for VSS signal: {}, Errors: {msg:?}", vsspath);
         }
     };
-    log::debug!("Got {} from storage  for {}" ,value, vsspath);
 }
 
 

diff --git a/kuksa-persistence-provider/src/main.rs b/kuksa-persistence-provider/src/main.rs
@@ -17,9 +17,6 @@ use std::{path::PathBuf,env};
 use clap::Parser;
 use tinyjson::JsonValue;
 
-use tokio;
-
-use log;
 
 #[derive(Parser)]
 #[command(version, about, long_about = None)]

diff --git a/kuksa-persistence-provider/src/storage/filestorage.rs b/kuksa-persistence-provider/src/storage/filestorage.rs
@@ -16,7 +16,6 @@ use std::collections::HashMap;
 use log;
 
 pub struct FileStorage {
-    storagefile: String,
     state: JsonValue,
 }
 
@@ -30,9 +29,9 @@ impl Storage for FileStorage {
                 println!("Reading storage from {}", path);
                 let config_str = std::fs::read_to_string(&path).unwrap();
                 let state = config_str.parse().unwrap();
-                FileStorage { storagefile: path, state: state }
+                FileStorage { state }
             }
-            _ => {
+            _ => { 
                 log::error!("Error: file storage path is invalid");
                 std::process::exit(1);
             }
@@ -49,11 +48,12 @@ impl Storage for FileStorage {
 
         if entry.is_some() && entry.unwrap().contains_key("value") {
             let value = entry.unwrap()["value"].get::<String>();
-            if value.is_some() {
-                return Some(value.unwrap());
+
+            if let Some(v) = value {
+                return Some(v);
             }
         }
-        return None;
+        None
     }
 
     fn set(&self, vsspath: &str, vssvalue: &'static str) -> Result<(), ()> {
@@ -64,7 +64,5 @@ impl Storage for FileStorage {
 }
 
 impl FileStorage {
-    pub fn get_storagefile(&self) -> &String {
-        &self.storagefile
-    }
+
 }