trunk formatting

Signed-off-by: Deren Vural <[email protected]>

Author: Deren Vural

install_schemas.sh

@@ -25,20 +25,20 @@ SCHEMA_DIR="$HOME/.local/share/glib-2.0/schemas"
 SCHEMA_FILE="com.gtk_d.NvidiaMonitorRust.gschema.xml"
 
 # Create schema directory if it doesn't exist
-if [[ -d "$SCHEMA_DIR" ]]; then
-  echo "$SCHEMA_DIR already exists.."
+if [[ -d $SCHEMA_DIR ]]; then
+	echo "$SCHEMA_DIR already exists.."
 else
-  echo "$SCHEMA_DIR needs created.."
-  mkdir -p "$SCHEMA_DIR"
+	echo "$SCHEMA_DIR needs created.."
+	mkdir -p "$SCHEMA_DIR"
 fi
 
 # Copy schema file across
 if [[ -f "$SCHEMA_DIR/$SCHEMA_FILE" ]]; then
-  echo "$SCHEMA_FILE already exists, overwriting.."
-  cp "./src/$SCHEMA_FILE" "$SCHEMA_DIR/"
+	echo "$SCHEMA_FILE already exists, overwriting.."
+	cp "./src/$SCHEMA_FILE" "$SCHEMA_DIR/"
 else
-  echo "$SCHEMA_FILE needs copied to $SCHEMA_DIR.."
-  cp "./src/$SCHEMA_FILE" "$SCHEMA_DIR/"
+	echo "$SCHEMA_FILE needs copied to $SCHEMA_DIR.."
+	cp "./src/$SCHEMA_FILE" "$SCHEMA_DIR/"
 fi
 
 # Compile schemas

src/mainwindow/mod.rs

@@ -533,7 +533,7 @@ impl MainWindow {
             let settings: &Settings = window.settings();
 
             // Get state from settings
-            settings_window_container.open = settings.boolean("app-settings-open").clone();
+            settings_window_container.open = settings.boolean("app-settings-open");
 
             // Check if an object is stored
             match &settings_window_container.window {

src/provider/imp.rs

@@ -229,9 +229,9 @@ impl ObjectImpl for Provider {
             }
             "provider-type" => {
                 //TODO: this seems ridiculous..
-                let value = self.provider_type.take();
+                let value = self.provider_type.get();
 
-                self.provider_type.set(value.clone());
+                self.provider_type.set(value);
 
                 value.to_value()
             }

src/provider/mod.rs

@@ -82,7 +82,7 @@ impl Provider {
 
         // Set properties
         let properties: Vec<Property> = func();
-        if properties.len() != 0 {
+        if !properties.is_empty() {
             obj.set_property("utilization-property", properties[0].clone());
             obj.set_property("temperature-property", properties[1].clone());
             obj.set_property("memory-usage-property", properties[2].clone());
@@ -121,19 +121,31 @@ impl Provider {
         match self.property::<i32>("provider-type") {
             // Nvidia Settings/SMI
             0 => {
-                processor_args = ["nvidia-settings", "-q GpuUUID -t"];
+                processor_args = [
+                    "nvidia-settings",
+                    "-q GpuUUID -t"
+                ];
             }
             // Nvidia Settings
             1 => {
-                processor_args = ["nvidia-settings", "-q GpuUUID -t"];
+                processor_args = [
+                    "nvidia-settings",
+                    "-q GpuUUID -t"
+                ];
             }
             // Nvidia SMI
             2 => {
-                processor_args = ["nvidia-smi", "--query-gpu=gpu_name --format=csv,noheader"];
+                processor_args = [
+                    "nvidia-smi",
+                    "--query-gpu=gpu_name --format=csv,noheader"
+                ];
             }
             // Nvidia Optimus
             3 => {
-                processor_args = ["optirun", "nvidia-smi --query-gpu=gpu_name --format=csv,noheader"];
+                processor_args = [
+                    "optirun",
+                    "nvidia-smi --query-gpu=gpu_name --format=csv,noheader"
+                ];
             }
             _ => {
                 // Return error..
@@ -227,7 +239,11 @@ impl Provider {
      * Notes:
      *
      */
-    pub fn update_property_value<T: ToValue + std::marker::Copy>(&self, property_name: &str, value: T) -> Result<(),String>{
+    pub fn update_property_value<T: ToValue + std::marker::Copy>(
+        &self,
+        property_name: &str,
+        value: T
+    ) -> Result<(),String>{
         // Fetch the list of properties (dependant on provider type)
         match self.property::<i32>("provider-type") {
             1 => {
@@ -266,8 +282,8 @@ impl Provider {
                 }
 
                 // Return sucess
-                return Ok(());
-            },
+                Ok(())
+            }
             _ => {
                 // Fetch list
                 let properties: [Property; 5] = [
@@ -308,8 +324,8 @@ impl Provider {
                 }
 
                 // Return sucess
-                return Ok(());
-            },
+                Ok(())
+            }
         }
     }
 }