Fixed the 'collapsible_if' clippy warnings

Relevant clippy warning: https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if

Author: ZapAnton

vm/src/obj/objobject.rs

@@ -151,21 +151,19 @@ fn object_getattribute(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
         Ok(obj_attr)
     } else if let Some(attr) = cls.get_attr(&name) {
         vm.call_get_descriptor(attr, obj.clone())
+    } else if let Some(getter) = cls.get_attr("__getattr__") {
+        vm.invoke(
+            getter,
+            PyFuncArgs {
+                args: vec![cls, name_str.clone()],
+                kwargs: vec![],
+            },
+        )
     } else {
-        if let Some(getter) = cls.get_attr("__getattr__") {
-            vm.invoke(
-                getter,
-                PyFuncArgs {
-                    args: vec![cls, name_str.clone()],
-                    kwargs: vec![],
-                },
-            )
-        } else {
-            let attribute_error = vm.context().exceptions.attribute_error.clone();
-            Err(vm.new_exception(
-                attribute_error,
-                format!("{} has no attribute '{}'", obj.borrow(), name),
-            ))
-        }
+        let attribute_error = vm.context().exceptions.attribute_error.clone();
+        Err(vm.new_exception(
+            attribute_error,
+            format!("{} has no attribute '{}'", obj.borrow(), name),
+        ))
     }
 }

vm/src/obj/objstr.rs

@@ -450,12 +450,8 @@ fn str_isidentifier(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
         && !value.chars().nth(0).unwrap().is_digit(10)
     {
         for c in value.chars() {
-            if c != "_".chars().nth(0).unwrap() {
-                if !c.is_digit(10) {
-                    if !c.is_alphabetic() {
-                        is_identifier = false;
-                    }
-                }
+            if c != "_".chars().nth(0).unwrap() && !c.is_digit(10) && !c.is_alphabetic() {
+                is_identifier = false;
             }
         }
     } else {

vm/src/obj/objtype.rs

@@ -192,22 +192,20 @@ pub fn type_getattribute(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult
         Ok(cls_attr)
     } else if let Some(attr) = mcl.get_attr(&name) {
         vm.call_get_descriptor(attr, cls.clone())
+    } else if let Some(getter) = cls.get_attr("__getattr__") {
+        vm.invoke(
+            getter,
+            PyFuncArgs {
+                args: vec![mcl, name_str.clone()],
+                kwargs: vec![],
+            },
+        )
     } else {
-        if let Some(getter) = cls.get_attr("__getattr__") {
-            vm.invoke(
-                getter,
-                PyFuncArgs {
-                    args: vec![mcl, name_str.clone()],
-                    kwargs: vec![],
-                },
-            )
-        } else {
-            let attribute_error = vm.context().exceptions.attribute_error.clone();
-            Err(vm.new_exception(
-                attribute_error,
-                format!("{} has no attribute '{}'", cls.borrow(), name),
-            ))
-        }
+        let attribute_error = vm.context().exceptions.attribute_error.clone();
+        Err(vm.new_exception(
+            attribute_error,
+            format!("{} has no attribute '{}'", cls.borrow(), name),
+        ))
     }
 }
 

vm/src/stdlib/math.rs

@@ -177,12 +177,10 @@ fn math_gamma(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
     if x.is_finite() {
         Ok(vm.ctx.new_float(gamma(x)))
+    } else if x.is_nan() || x.is_sign_positive() {
+        Ok(vm.ctx.new_float(x))
     } else {
-        if x.is_nan() || x.is_sign_positive() {
-            Ok(vm.ctx.new_float(x))
-        } else {
-            Ok(vm.ctx.new_float(std::f64::NAN))
-        }
+        Ok(vm.ctx.new_float(std::f64::NAN))
     }
 }
 
@@ -192,12 +190,10 @@ fn math_lgamma(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
     if x.is_finite() {
         Ok(vm.ctx.new_float(ln_gamma(x)))
+    } else if x.is_nan() {
+        Ok(vm.ctx.new_float(x))
     } else {
-        if x.is_nan() {
-            Ok(vm.ctx.new_float(x))
-        } else {
-            Ok(vm.ctx.new_float(std::f64::INFINITY))
-        }
+        Ok(vm.ctx.new_float(std::f64::INFINITY))
     }
 }