Resolved the clippy warnings

kitao · Jan 8, 2022 · 795d1d8 · 795d1d8
1 parent 517cde8
commit 795d1d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 1.5.8
 - Fixed a pyxapp to be included in Python wheel
+- Resolved the clippy warnings
 
 ## 1.5.7
 - Fixed the example #11 images

diff --git a/lib/wrapper/src/graphics_wrapper.rs b/lib/wrapper/src/graphics_wrapper.rs
@@ -19,7 +19,7 @@ fn tilemap(tm: u32) -> Tilemap {
 fn clip(x: Option<f64>, y: Option<f64>, w: Option<f64>, h: Option<f64>) -> PyResult<()> {
     if let (Some(x), Some(y), Some(w), Some(h)) = (x, y, w, h) {
         instance().clip(x, y, w, h);
-    } else if let (None, None, None, None) = (x, y, w, h) {
+    } else if (x, y, w, h) == (None, None, None, None) {
         instance().clip0();
     } else {
         type_error!("clip() takes 0 or 4 arguments");
@@ -31,7 +31,7 @@ fn clip(x: Option<f64>, y: Option<f64>, w: Option<f64>, h: Option<f64>) -> PyRes
 fn camera(x: Option<f64>, y: Option<f64>) -> PyResult<()> {
     if let (Some(x), Some(y)) = (x, y) {
         instance().camera(x, y);
-    } else if let (None, None) = (x, y) {
+    } else if (x, y) == (None, None) {
         instance().camera0();
     } else {
         type_error!("camera() takes 0 or 2 arguments");
@@ -43,7 +43,7 @@ fn camera(x: Option<f64>, y: Option<f64>) -> PyResult<()> {
 fn pal(col1: Option<Color>, col2: Option<Color>) -> PyResult<()> {
     if let (Some(col1), Some(col2)) = (col1, col2) {
         instance().pal(col1, col2);
-    } else if let (None, None) = (col1, col2) {
+    } else if (col1, col2) == (None, None) {
         instance().pal0();
     } else {
         type_error!("pal() takes 0 or 2 arguments");

diff --git a/lib/wrapper/src/image_wrapper.rs b/lib/wrapper/src/image_wrapper.rs
@@ -68,7 +68,7 @@ impl Image {
     ) -> PyResult<()> {
         if let (Some(x), Some(y), Some(w), Some(h)) = (x, y, w, h) {
             self.pyxel_image.lock().clip(x, y, w, h);
-        } else if let (None, None, None, None) = (x, y, w, h) {
+        } else if (x, y, w, h) == (None, None, None, None) {
             self.pyxel_image.lock().clip0();
         } else {
             type_error!("clip() takes 0 or 4 arguments");
@@ -79,7 +79,7 @@ impl Image {
     pub fn camera(&self, x: Option<f64>, y: Option<f64>) -> PyResult<()> {
         if let (Some(x), Some(y)) = (x, y) {
             self.pyxel_image.lock().camera(x, y);
-        } else if let (None, None) = (x, y) {
+        } else if (x, y) == (None, None) {
             self.pyxel_image.lock().camera0();
         } else {
             type_error!("camera() takes 0 or 2 arguments");

diff --git a/lib/wrapper/src/lib.rs b/lib/wrapper/src/lib.rs
@@ -6,6 +6,7 @@
     clippy::missing_panics_doc,
     clippy::multiple_crate_versions,
     clippy::must_use_candidate,
+    clippy::needless_option_as_deref,
     clippy::needless_pass_by_value,
     clippy::new_without_default,
     clippy::pedantic,