Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #404 from ZapAnton/fix_if_same_then_else

Browse Source 
Fix the 'if_same_then_else' clippy warnings
This commit is contained in:
Adam
2019-02-08 18:29:02 +00:00
committed by GitHub
parent 07fd61f55f 0e6fca0106
commit bf294a82e8
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vm/src/obj/objbytearray.rs
View File

@@ -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);
}

6
vm/src/obj/objrange.rs
View File

@@ -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

7
vm/src/stdlib/json.rs
View File

@@ -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()) {

6
vm/src/vm.rs
View File

@@ -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)?;