From 0e6fca01062d926693afc6fb1ede00bff5c96460 Mon Sep 17 00:00:00 2001
From: ZapAnton <wc3ft2@gmail.com>
Date: Fri, 8 Feb 2019 20:04:30 +0300
Subject: [PATCH] Fix the 'if_same_then_else' clippy warnings

Relevant clippy warning: https://rust-lang.github.io/rust-clippy/master/index.html#if_same_then_else
---
 vm/src/obj/objbytearray.rs | 7 ++++---
 vm/src/obj/objrange.rs     | 6 +++---
 vm/src/stdlib/json.rs      | 7 +++----
 vm/src/vm.rs               | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/vm/src/obj/objbytearray.rs b/vm/src/obj/objbytearray.rs
index c6fc8c35c..9de2eb0f0 100644
--- a/vm/src/obj/objbytearray.rs
+++ b/vm/src/obj/objbytearray.rs
@@ -203,11 +203,12 @@ fn bytearray_istitle(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
                 }
             };
 
-            if is_cased(current) && next.is_uppercase() && !prev_cased {
-                return Ok(vm.new_bool(false));
-            } else if !is_cased(current) && next.is_lowercase() {
+            if (is_cased(current) && next.is_uppercase() && !prev_cased)
+                || (!is_cased(current) && next.is_lowercase())
+            {
                 return Ok(vm.new_bool(false));
             }
+
             prev_cased = is_cased(current);
         }
 
diff --git a/vm/src/obj/objrange.rs b/vm/src/obj/objrange.rs
index cd897ff34..d82a4abc3 100644
--- a/vm/src/obj/objrange.rs
+++ b/vm/src/obj/objrange.rs
@@ -68,9 +68,9 @@ impl RangeType {
     pub fn get(&self, index: BigInt) -> Option<BigInt> {
         let result = self.start.clone() + self.step.clone() * index;
 
-        if self.forward() && !self.is_empty() && result < self.end {
-            Some(result)
-        } else if !self.forward() && !self.is_empty() && result > self.end {
+        if (self.forward() && !self.is_empty() && result < self.end)
+            || (!self.forward() && !self.is_empty() && result > self.end)
+        {
             Some(result)
         } else {
             None
diff --git a/vm/src/stdlib/json.rs b/vm/src/stdlib/json.rs
index e284c2c31..e5d626168 100644
--- a/vm/src/stdlib/json.rs
+++ b/vm/src/stdlib/json.rs
@@ -53,10 +53,9 @@ impl<'s> serde::Serialize for PyObjectSerializer<'s> {
             serializer.serialize_i64(v.to_i64().unwrap())
         // Allthough this may seem nice, it does not give the right result:
         // v.serialize(serializer)
-        } else if objtype::isinstance(self.pyobject, &self.ctx.list_type()) {
-            let elements = objsequence::get_elements(self.pyobject);
-            serialize_seq_elements(serializer, &elements)
-        } else if objtype::isinstance(self.pyobject, &self.ctx.tuple_type()) {
+        } else if objtype::isinstance(self.pyobject, &self.ctx.list_type())
+            || objtype::isinstance(self.pyobject, &self.ctx.tuple_type())
+        {
             let elements = objsequence::get_elements(self.pyobject);
             serialize_seq_elements(serializer, &elements)
         } else if objtype::isinstance(self.pyobject, &self.ctx.dict_type()) {
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
index 9bbd94d64..8bcadd11c 100644
--- a/vm/src/vm.rs
+++ b/vm/src/vm.rs
@@ -439,9 +439,9 @@ impl VirtualMachine {
         value: &PyObjectRef,
     ) -> Result<Vec<PyObjectRef>, PyObjectRef> {
         // Extract elements from item, if possible:
-        let elements = if objtype::isinstance(value, &self.ctx.tuple_type()) {
-            objsequence::get_elements(value).to_vec()
-        } else if objtype::isinstance(value, &self.ctx.list_type()) {
+        let elements = if objtype::isinstance(value, &self.ctx.tuple_type())
+            || objtype::isinstance(value, &self.ctx.list_type())
+        {
             objsequence::get_elements(value).to_vec()
         } else {
             let iter = objiter::get_iter(self, value)?;