Fix clippy maybe?

carbotaniuman · carbotaniuman · commit 6498d7922ddd · 2020-11-14T13:11:47.000-06:00
diff --git a/vm/src/function.rs b/vm/src/function.rs
@@ -196,10 +196,9 @@ impl FuncArgs {
                 T::arity().end(),
                 given_args,
             )))
+        } else if let Some(err) = self.check_kwargs_empty(vm) {
+            Err(err)
         } else {
-            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
@@ -7,8 +7,6 @@
 
 // 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)]

Original file line number	Diff line number	Diff line change
`@@ -196,10 +196,9 @@ impl FuncArgs {`
`196`	`196`	`T::arity().end(),`
`197`	`197`	`given_args,`
`198`	`198`	`)))`
	`199`	`+ } else if let Some(err) = self.check_kwargs_empty(vm) {`
	`200`	`+ Err(err)`
`199`	`201`	`} else {`
`200`		`- if let Some(err) = self.check_kwargs_empty(vm) {`
`201`		`- return Err(err);`
`202`		`- }`
`203`	`202`	`Ok(bound)`
`204`	`203`	`}`
`205`	`204`	`}`