From 3a45839e01d52ae5272f5915fb9420d9f83f225a Mon Sep 17 00:00:00 2001
From: carbotaniuman <41451839+carbotaniuman@users.noreply.github.com>
Date: Wed, 11 Nov 2020 19:17:39 -0600
Subject: [PATCH] Supress clippy lint that doesn't work

---
 vm/src/builtins/make_module.rs | 10 ++++------
 vm/src/function.rs             |  5 ++---
 vm/src/lib.rs                  |  2 ++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/vm/src/builtins/make_module.rs b/vm/src/builtins/make_module.rs
index c1933a899..00e9face5 100644
--- a/vm/src/builtins/make_module.rs
+++ b/vm/src/builtins/make_module.rs
@@ -521,20 +521,18 @@ mod decl {
         let default = args.take_keyword("default");
         let mut key_func = args.take_keyword("key");
 
-        match args.check_kwargs_empty(vm) {
-            Some(err) => return Err(err),
-            None => {}
+        if let Some(err) = args.check_kwargs_empty(vm) {
+            return Err(err);
         }
 
-        if !default_allowed && default.is_some() {
+        if default.is_some() && !default_allowed {
             return Err(vm.new_type_error(
                 "Specifying default not allowed with more than 1 argument".to_owned(),
             ));
         }
 
         if candidates.is_empty() {
-            return default
-                .ok_or_else(|| vm.new_value_error("min() arg is an empty sequence".to_owned()));
+            return default.ok_or_else(|| vm.new_value_error("min() arg is an empty sequence".to_owned()));
         }
 
         if let Some(ref obj) = key_func {
diff --git a/vm/src/function.rs b/vm/src/function.rs
index 6e6d59e30..902920d9b 100644
--- a/vm/src/function.rs
+++ b/vm/src/function.rs
@@ -197,9 +197,8 @@ impl FuncArgs {
                 given_args,
             )))
         } else {
-            match self.check_kwargs_empty(vm) {
-                Some(err) => return Err(err),
-                None => {}
+            if let Some(err) = self.check_kwargs_empty(vm) {
+                return Err(err);
             }
             Ok(bound)
         }
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
index bcd00bb68..9204867a5 100644
--- a/vm/src/lib.rs
+++ b/vm/src/lib.rs
@@ -7,6 +7,8 @@
 
 // for methods like vm.to_str(), not the typical use of 'to' as a method prefix
 #![allow(clippy::wrong_self_convention, clippy::implicit_hasher)]
+// clippy warns on this for macro generated code rust-clippy/issues/6249
+#![allow(clippy::suspicious_else_formatting)]
 // to allow `mod foo {}` in foo.rs; clippy thinks this is a mistake/misunderstanding of
 // how `mod` works, but we want this sometimes for pymodule declarations
 #![allow(clippy::module_inception)]