trunk formatting

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

Author: Deren Vural

src/gpu_page/imp.rs

@@ -19,14 +19,17 @@
  */
 
 // Imports
-use std::{cell::Ref, cell::Cell, cell::RefCell, rc::Rc};
+use adwaita::{gio, glib, prelude::*};
 use gio::Settings;
-use glib::{once_cell::sync::OnceCell, once_cell::sync::Lazy, ParamSpec, ToValue, Value, subclass::InitializingObject};
+use glib::{
+    once_cell::sync::Lazy, once_cell::sync::OnceCell, subclass::InitializingObject, ParamSpec,
+    ToValue, Value,
+};
 use gtk::{subclass::prelude::*, CompositeTemplate};
-use adwaita::{glib, gio, prelude::*};
+use std::{cell::Cell, cell::Ref, cell::RefCell, rc::Rc};
 
 // Modules
-use crate::{provider::Provider};
+use crate::provider::Provider;
 
 /// Object holding the State and any Template Children
 #[derive(CompositeTemplate, Default)]
@@ -195,31 +198,25 @@ impl ObjectImpl for GpuPage {
         // println!("N: `{}`", x);
 
         match pspec.name() {
-            "uuid" => {
-                match value.get() {
-                    Ok(input_uuid) => {
-                        self.uuid.replace(input_uuid);
-                    },
-                    Err(_) => panic!("The value needs to be of type `String`."),
+            "uuid" => match value.get() {
+                Ok(input_uuid) => {
+                    self.uuid.replace(input_uuid);
                 }
-            }
-            "name" => {
-                match value.get() {
-                    Ok(input_name) => {
-                        self.name.replace(input_name);
-                    },
-                    Err(_) => panic!("The value needs to be of type `String`."),
+                Err(_) => panic!("The value needs to be of type `String`."),
+            },
+            "name" => match value.get() {
+                Ok(input_name) => {
+                    self.name.replace(input_name);
                 }
-            }
-            "provider" => {
-                match value.get() {
-                    Ok(input_provider_property) => {
-                        self.provider.replace(input_provider_property);
-                    },
-                    Err(_) => panic!("The value needs to be of type `Provider`."),
+                Err(_) => panic!("The value needs to be of type `String`."),
+            },
+            "provider" => match value.get() {
+                Ok(input_provider_property) => {
+                    self.provider.replace(input_provider_property);
                 }
-            }
-            _ => panic!("Property `{}` does not exist..", pspec.name())
+                Err(_) => panic!("The value needs to be of type `Provider`."),
+            },
+            _ => panic!("Property `{}` does not exist..", pspec.name()),
         }
 
         // let x: String = self.uuid.take();
@@ -273,7 +270,7 @@ impl ObjectImpl for GpuPage {
 
                 value.to_value()
             }
-            _ => panic!("Property `{}` does not exist..", pspec.name())
+            _ => panic!("Property `{}` does not exist..", pspec.name()),
         }
     }
 }
@@ -313,4 +310,3 @@ impl WidgetImpl for GpuPage {}
  *
  */
 impl GridImpl for GpuPage {}
-

src/gpu_page/mod.rs

@@ -17,19 +17,20 @@
  * Notes:
  *
  */
-
 // Custom GObjects
 mod imp;
 
 // Imports
-use glib::Object;
+use adwaita::{gio, glib};
 use gio::Settings;
-use adwaita::{glib, gio};
-use gtk::{subclass::prelude::*, prelude::*, Label, Orientation::Horizontal, Box, LayoutChild, Button};
-use std::{sync::MutexGuard, sync::Arc, sync::Mutex};
+use glib::Object;
+use gtk::{
+    prelude::*, subclass::prelude::*, Box, Button, Label, LayoutChild, Orientation::Horizontal,
+};
+use std::{sync::Arc, sync::Mutex, sync::MutexGuard};
 
 // Modules
-use crate::{APP_ID, provider::Provider};
+use crate::{provider::Provider, APP_ID};
 
 // GObject wrapper for GpuPage
 glib::wrapper! {
@@ -170,38 +171,32 @@ impl GpuPage {
                     "memory_usage",
                     "memory_total",
                     "fan_speed",
-                    "power_usage"
+                    "power_usage",
                 ];
                 let statistics_store: Arc<Mutex<Vec<&str>>> = Arc::new(Mutex::new(statistics_data));
 
                 // Edit button
-                let edit_button: Button = Button::builder()
-                    .build();
+                let edit_button: Button = Button::builder().build();
                 self.attach(&edit_button, 3, 0, 24, 24);
 
                 // Set layout properties of button
                 let child_manager: LayoutChild = grid_manager.layout_child(&edit_button);
                 child_manager.set_property("row-span", 2);
                 child_manager.set_property("column-span", 2);
 
-
                 // For each Statistic
                 let mut labels: Vec<Label> = Vec::new();
                 for statistic in Arc::clone(&statistics_store).lock().unwrap().iter() {
                     //==BUILD==
                     // Build label & add to grid
                     let new_title: String = String::from(statistic.to_owned()) + "_label";
-                    let new_title_label: Label = Label::builder()
-                        .label(statistic)
-                        .name(&new_title)
-                        .build();
+                    let new_title_label: Label =
+                        Label::builder().label(statistic).name(&new_title).build();
 
                     // Build label & add to grid
                     let new_content: String = String::from(statistic.to_owned());
-                    let new_content_label: Label = Label::builder()
-                        .label("")
-                        .name(&new_content)
-                        .build();
+                    let new_content_label: Label =
+                        Label::builder().label("").name(&new_content).build();
 
                     // Create box for 2 labels
                     let new_box_name: String = String::from(statistic.to_owned()) + "_box";
@@ -218,7 +213,6 @@ impl GpuPage {
                     child_manager.set_property("row-span", 2);
                     child_manager.set_property("column-span", 2);
 
-
                     //==SHOW==
                     // Show new labels & box
                     new_box.show();
@@ -243,12 +237,7 @@ impl GpuPage {
                     let uuid: String = uuid_lock.lock().unwrap().as_str().to_owned();
 
                     // Create provider for scanning gpu data
-                    let provider: Provider = Provider::new(
-                        || {
-                            vec![]
-                        },
-                        0,
-                    );
+                    let provider: Provider = Provider::new(Vec::new, 0);
 
                     // For each Statistic
                     for statistic in statistics.iter() {
@@ -258,21 +247,21 @@ impl GpuPage {
                                 // For each output label of the page
                                 for label in &labels {
                                     // Check if correct label
-                                    if String::from(statistic.to_owned()) == String::from(label.widget_name()) {
+                                    if *statistic.to_owned() == label.widget_name() {
                                         label.set_label(&stat);
                                     }
                                 }
                             }
                             Err(err) => {
                                 println!("panicked when fetching gpu data: `{}`", err);
-                                return Continue(false)
+                                return Continue(false);
                             }
                         }
                     }
 
-                    return Continue(true)
+                    Continue(true)
                 });
-            },
+            }
             None => panic!("Cannot fetch layout manager of grid.."),
         }
     }

src/mainwindow/imp.rs

@@ -437,7 +437,7 @@ impl MainWindow {
      */
     fn create_gpu_page(&self, uuid: &str, name: &str, provider: &Provider) {
         // Create new GpuPage object
-        let new_page: GpuPage = GpuPage::new(&uuid, &name, &provider);
+        let new_page: GpuPage = GpuPage::new(uuid, name, provider);
 
         // Add to list of pages
         let mut gpu_page_list: RefMut<Vec<GpuPage>> = self.gpu_pages.borrow_mut();
@@ -451,7 +451,7 @@ impl MainWindow {
         scrolled_window.set_child(Some(new_page_ref));
 
         // Append new ListBoxRow object to GtkListBox
-        self.gpu_stack.add_titled(&scrolled_window, Some(&uuid), &name);
+        self.gpu_stack.add_titled(&scrolled_window, Some(uuid), name);
     }
 
     /**