chore: Fix some clippy lints

Author: ids1024

src/application/keyboard.rs

@@ -392,15 +392,15 @@ impl Keyboard {
         }
         KeyMap {
             board: self.board_name().to_string(),
-            map: map,
+            map,
         }
     }
 
     pub fn import_keymap(&self, keymap: &KeyMap) {
         // TODO: don't block UI thread
         // TODO: Ideally don't want this function to be O(Keys^2)
 
-        if &keymap.board != self.board_name() {
+        if keymap.board != self.board_name() {
             error_dialog(
                 &self.window().unwrap(),
                 "Failed to import keymap",

src/application/layout/mod.rs

@@ -149,7 +149,7 @@ impl Layout {
                                 logical_name,
                                 physical: Rect::new(x, y, w, h),
                                 physical_name: name.clone(),
-                                electrical: electrical.clone(),
+                                electrical: *electrical,
                                 electrical_name: format!("{}, {}", electrical.0, electrical.1),
                                 scancodes: RefCell::new(Vec::new()),
                                 background_color,

src/application/picker/mod.rs

@@ -17,7 +17,7 @@ use picker_json::picker_json;
 use picker_key::PickerKey;
 
 const DEFAULT_COLS: i32 = 3;
-const PICKER_CSS: &'static str = r#"
+const PICKER_CSS: &str = r#"
 button {
     margin: 0;
     padding: 0;

src/color_circle.rs

@@ -93,7 +93,7 @@ impl ObjectImpl for ColorCircleInner {
         match pspec.get_name() {
             "rgb" => {
                 let rgb: &Rgb = value.get_some().unwrap();
-                widget.set_rgb(rgb.clone());
+                widget.set_rgb(*rgb);
             }
             _ => unimplemented!(),
         }

src/color_wheel.rs

@@ -141,7 +141,7 @@ impl ColorWheel {
                 let Rgb { r, g, b } = Hs::new(angle, distance / radius).to_rgb();
 
                 let offset = (row * stride + col * 4) as usize;
-                data[offset + 0] = b;
+                data[offset] = b;
                 data[offset + 1] = g;
                 data[offset + 2] = r;
             }

src/daemon/dummy.rs

@@ -20,7 +20,7 @@ pub struct DaemonDummy {
 
 impl DaemonDummy {
     fn board(&self, board: usize) -> Result<&BoardDummy, String> {
-        self.boards.get(board).ok_or("No board".to_string())
+        self.boards.get(board).ok_or_else(|| "No board".to_string())
     }
 }
 

src/daemon/s76power.rs

@@ -8,8 +8,8 @@ use std::{cell::Cell, iter::Iterator};
 use super::{err_str, Daemon};
 use crate::color::Rgb;
 
-const DBUS_NAME: &'static str = "com.system76.PowerDaemon";
-const DBUS_KEYBOARD_IFACE: &'static str = "com.system76.PowerDaemon.Keyboard";
+const DBUS_NAME: &str = "com.system76.PowerDaemon";
+const DBUS_KEYBOARD_IFACE: &str = "com.system76.PowerDaemon.Keyboard";
 
 struct Keyboard {
     proxy: gio::DBusProxy,
@@ -79,7 +79,7 @@ pub struct DaemonS76Power {
 
 impl DaemonS76Power {
     fn board(&self, board: usize) -> Result<&Keyboard, String> {
-        self.boards.get(board).ok_or("No board".to_string())
+        self.boards.get(board).ok_or_else(|| "No board".to_string())
     }
 }
 
@@ -158,7 +158,7 @@ impl Daemon for DaemonS76Power {
         let color = self.board(board)?.prop::<String>("color")?;
         Ok(color
             .and_then(|c| Rgb::parse(&c))
-            .unwrap_or(Rgb::new(0, 0, 0)))
+            .unwrap_or_else(|| Rgb::new(0, 0, 0)))
     }
 
     fn set_color(&self, board: usize, color: Rgb) -> Result<(), String> {

src/keyboard_color_button.rs

@@ -122,7 +122,7 @@ impl ObjectImpl for KeyboardColorButtonInner {
         match pspec.get_name() {
             "rgb" => {
                 let rgb: &Rgb = value.get_some().unwrap();
-                widget.set_rgb(rgb.clone());
+                widget.set_rgb(*rgb);
                 widget.notify("rgb");
             }
             _ => unimplemented!(),
@@ -219,11 +219,9 @@ impl KeyboardColorButton {
             self.add_color(color);
             self.inner().remove_button.set_visible(true);
             self.populate_grid();
-        } else {
-            if let Some(circle) = &*self.inner().current_circle.borrow() {
-                if let Err(err) = self.board().set_color(circle.rgb()) {
-                    eprintln!("Failed to set keyboard color: {}", err);
-                }
+        } else if let Some(circle) = &*self.inner().current_circle.borrow() {
+            if let Err(err) = self.board().set_color(circle.rgb()) {
+                eprintln!("Failed to set keyboard color: {}", err);
             }
         }
     }
@@ -247,10 +245,8 @@ impl KeyboardColorButton {
                 choose_color(self.board().clone(), self, "Edit Color", Some(circle.rgb()))
             {
                 circle.set_rgb(color);
-            } else {
-                if let Err(err) = self.board().set_color(circle.rgb()) {
-                    eprintln!("Failed to set keyboard color: {}", err);
-                }
+            } else if let Err(err) = self.board().set_color(circle.rgb()) {
+                eprintln!("Failed to set keyboard color: {}", err);
             }
         }
     }