clippy

Author: unsecretised

src/app/tile.rs

@@ -296,7 +296,7 @@ impl Tile {
                             } else if modifiers.command() {
                                 s.parse::<usize>()
                                     .ok()
-                                    .filter(|&n| n >= 1 && n <= 9)
+                                    .filter(|&n| (1..=9).contains(&n))
                                     .map(|n| Message::OpenResult((n - 1) as u32))
                             } else if s == "p" && modifiers.control() {
                                 Some(Message::ChangeFocus(ArrowKey::Up, 1))

src/app/tile/elm.rs

@@ -41,7 +41,7 @@ pub fn new(hotkeys: Hotkeys, config: &Config) -> (Tile, Task<Message>) {
 
     let events = Event::get_events(config.event_duration);
 
-    let pos = config.window_location.clone();
+    let pos = config.window_location;
 
     let open = open.discard().chain(window::run(id, move |handle| {
         platform::window_config(

src/app/tile/update.rs

@@ -513,12 +513,12 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             ])
         }
         Message::RunFunction(command) => {
-            if let Function::TileWindow(pos) = &command {
-                if let Some(pid) = tile.frontmost.as_ref().map(|a| a.processIdentifier()) {
-                    let ok = crate::platform::macos::window::tile_focused_window(pid, pos);
-                    if !ok && tile.config.haptic_feedback {
-                        perform_haptic(HapticPattern::Alignment);
-                    }
+            if let Function::TileWindow(pos) = &command
+                && let Some(pid) = tile.frontmost.as_ref().map(|a| a.processIdentifier())
+            {
+                let ok = crate::platform::macos::window::tile_focused_window(pid, pos);
+                if !ok && tile.config.haptic_feedback {
+                    perform_haptic(HapticPattern::Alignment);
                 }
             }
             command.execute(&tile.config);

src/config.rs

@@ -169,18 +169,14 @@ impl std::fmt::Display for MainPage {
 /// The mode for the theme (dark, light, or follow system)
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, Copy)]
 #[serde(rename_all = "lowercase")]
+#[derive(Default)]
 pub enum ThemeMode {
+    #[default]
     Dark,
     Light,
     System,
 }
 
-impl Default for ThemeMode {
-    fn default() -> Self {
-        ThemeMode::Dark
-    }
-}
-
 impl ThemeMode {
     /// Return preset text and background colors for this mode.
     pub fn presets(

src/platform/macos/launching.rs

@@ -121,7 +121,7 @@ extern "C-unwind" fn keyboard_event_callback(
         _ => return unsafe { event.as_mut() },
     };
 
-    if !data.targets.iter().any(|t| *t == shortcut) {
+    if !data.targets.contains(&shortcut) {
         return unsafe { event.as_mut() };
     }
 

src/platform/macos/mod.rs

@@ -75,7 +75,7 @@ pub fn screen_with_mouse() -> Retained<NSScreen> {
 }
 
 /// This carries out the window configuration for the macos window (only things that are macos specific)
-pub(super) fn macos_window_config(handle: &WindowHandle, position: Position) {
+pub(super) fn macos_window_config(handle: &WindowHandle, _position: Position) {
     use iced::wgpu::rwh::RawWindowHandle;
     use objc2::rc::Retained;
     use objc2_app_kit::NSView;

src/styles.rs

@@ -2,7 +2,7 @@
 use crate::config::Theme as ConfigTheme;
 use iced::Shadow;
 use iced::border::Radius;
-use iced::overlay::menu::{self, Menu};
+use iced::overlay::menu::{self};
 use iced::widget::toggler::Status;
 use iced::widget::{button, container, pick_list, radio, scrollable, slider, toggler};
 use iced::{Background, Border, Color, widget::text_input};