chore(lint): make clippy happy

Author: sassman

src/common/mod.rs

@@ -9,37 +9,3 @@ pub trait PlatformApi: Send {
     fn capture_window_screenshot(&self, window_id: WindowId) -> Result<ImageOnHeap>;
     fn get_active_window(&self) -> Result<WindowId>;
 }
-
-#[derive(Debug)]
-pub struct Margin {
-    pub top: u16,
-    pub right: u16,
-    pub bottom: u16,
-    pub left: u16,
-}
-
-impl Margin {
-    pub fn new(top: u16, right: u16, bottom: u16, left: u16) -> Self {
-        Self {
-            top,
-            right,
-            bottom,
-            left,
-        }
-    }
-
-    pub fn new_equal(margin: u16) -> Self {
-        Self::new(margin, margin, margin, margin)
-    }
-
-    pub fn zero() -> Self {
-        Self::new_equal(0)
-    }
-
-    pub fn is_zero(&self) -> bool {
-        self.top == 0
-            && self.right == self.left
-            && self.left == self.bottom
-            && self.bottom == self.top
-    }
-}

src/linux/mod.rs

@@ -6,3 +6,70 @@ use x11_api::X11Api;
 pub fn setup() -> Result<Box<dyn PlatformApi>> {
     Ok(Box::new(X11Api::new()?))
 }
+
+#[derive(Debug)]
+pub struct Margin {
+    pub top: u16,
+    pub right: u16,
+    pub bottom: u16,
+    pub left: u16,
+}
+
+impl Margin {
+    pub fn new(top: u16, right: u16, bottom: u16, left: u16) -> Self {
+        Self {
+            top,
+            right,
+            bottom,
+            left,
+        }
+    }
+
+    pub fn new_equal(margin: u16) -> Self {
+        Self::new(margin, margin, margin, margin)
+    }
+
+    pub fn zero() -> Self {
+        Self::new_equal(0)
+    }
+
+    pub fn is_zero(&self) -> bool {
+        self.top == 0
+            && self.right == self.left
+            && self.left == self.bottom
+            && self.bottom == self.top
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn margin_new() {
+        let m = Margin::new(1, 2, 3, 4);
+        assert_eq!(m.top, 1);
+        assert_eq!(m.right, 2);
+        assert_eq!(m.bottom, 3);
+        assert_eq!(m.left, 4);
+    }
+
+    #[test]
+    fn margin_new_equal() {
+        let m = Margin::new_equal(1);
+        assert_eq!(m.top, 1);
+        assert_eq!(m.right, 1);
+        assert_eq!(m.bottom, 1);
+        assert_eq!(m.left, 1);
+    }
+
+    #[test]
+    fn margin_zero() {
+        let m = Margin::zero();
+        assert_eq!(m.top, 0);
+        assert_eq!(m.right, 0);
+        assert_eq!(m.bottom, 0);
+        assert_eq!(m.left, 0);
+        assert!(m.is_zero());
+    }
+}

src/linux/x11_api.rs

@@ -1,4 +1,4 @@
-use crate::common::Margin;
+use crate::linux::Margin;
 use crate::{ImageOnHeap, PlatformApi, Result, WindowId, WindowList};
 use anyhow::Context;
 use image::flat::{SampleLayout, View};

src/macos/window_id.rs

@@ -56,12 +56,10 @@ pub fn window_list() -> Result<WindowList> {
         }
         let window_owner = get_from_dict(dic_ref, "kCGWindowOwnerName");
         let window_id = get_from_dict(dic_ref, "kCGWindowNumber");
-        // let is_onscreen = get_from_dict(dic_ref, "kCGWindowIsOnscreen");
-        match (window_owner, window_id) {
-            (DictEntryValue::_String(name), DictEntryValue::_Number(win_id)) => {
-                win_list.push((Some(name), win_id as u64));
-            }
-            _ => {}
+        if let (DictEntryValue::_String(name), DictEntryValue::_Number(win_id)) =
+            (window_owner, window_id)
+        {
+            win_list.push((Some(name), win_id as u64));
         }
     }