Merge pull request RustPython#4047 from youknowone/fix-clippy

Fix clippy

Author: youknowone

ast/asdl_rs.py

@@ -1,4 +1,7 @@
 // File automatically generated by ast/asdl_rs.py.
+
+#![allow(clippy::derive_partial_eq_without_eq)]
+
 pub use crate::constant::*;
 pub use crate::location::Location;
 

ast/src/ast_gen.rs

@@ -566,10 +566,16 @@ mod decl {
             let trailing_garbage_error = || Err(vm.new_value_error("Trailing garbage".to_string()));
 
             for chunk in b.get(1..).unwrap_or_default().chunks(4) {
-                let char_a = chunk.get(0).map_or(Ok(0), |x| uu_a2b_read(x, vm))?;
-                let char_b = chunk.get(1).map_or(Ok(0), |x| uu_a2b_read(x, vm))?;
-                let char_c = chunk.get(2).map_or(Ok(0), |x| uu_a2b_read(x, vm))?;
-                let char_d = chunk.get(3).map_or(Ok(0), |x| uu_a2b_read(x, vm))?;
+                let (char_a, char_b, char_c, char_d) = {
+                    let mut chunk = chunk
+                        .iter()
+                        .map(|x| uu_a2b_read(x, vm))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    while chunk.len() < 4 {
+                        chunk.push(0);
+                    }
+                    (chunk[0], chunk[1], chunk[2], chunk[3])
+                };
 
                 if res.len() < length {
                     res.push(char_a << 2 | char_b >> 4);
@@ -628,7 +634,7 @@ mod decl {
             res.push(uu_b2a(length as u8, backtick));
 
             for chunk in b.chunks(3) {
-                let char_a = *chunk.get(0).unwrap_or(&0);
+                let char_a = *chunk.first().unwrap();
                 let char_b = *chunk.get(1).unwrap_or(&0);
                 let char_c = *chunk.get(2).unwrap_or(&0);
 

stdlib/src/binascii.rs

@@ -354,7 +354,7 @@ impl CFormatSpec {
             _ => unreachable!(),
         };
 
-        let formatted = if self.flags.contains(CConversionFlags::ZERO_PAD) {
+        if self.flags.contains(CConversionFlags::ZERO_PAD) {
             let fill_char = if !self.flags.contains(CConversionFlags::LEFT_ADJUST) {
                 '0'
             } else {
@@ -377,9 +377,7 @@ impl CFormatSpec {
                 None,
                 false,
             )
-        };
-
-        formatted
+        }
     }
 
     fn bytes_format(&self, vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Vec<u8>> {

vm/src/cformat.rs

@@ -99,7 +99,7 @@ struct DictEntry<T> {
 }
 static_assertions::assert_eq_size!(DictEntry<PyObjectRef>, Option<DictEntry<PyObjectRef>>);
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct DictSize {
     indices_size: usize,
     pub entries_size: usize,

vm/src/dictdatatype.rs

@@ -179,7 +179,7 @@ mod decl {
                     buf.push(Type::Bytes as u8);
                     let data = bytes.as_bytes();
                     write_size(buf, data.len(), vm)?;
-                    buf.extend(&*data);
+                    buf.extend(data);
                 }
                 bytes @ PyByteArray => {
                     buf.push(Type::Bytes as u8);

vm/src/stdlib/marshal.rs

@@ -327,7 +327,7 @@ impl Context {
     #[inline]
     pub fn new_int<T: Into<BigInt> + ToPrimitive>(&self, i: T) -> PyIntRef {
         if let Some(i) = i.to_i32() {
-            if i >= Self::INT_CACHE_POOL_MIN && i <= Self::INT_CACHE_POOL_MAX {
+            if (Self::INT_CACHE_POOL_MIN..=Self::INT_CACHE_POOL_MAX).contains(&i) {
                 let inner_idx = (i - Self::INT_CACHE_POOL_MIN) as usize;
                 return self.int_cache_pool[inner_idx].clone();
             }
@@ -338,7 +338,7 @@ impl Context {
     #[inline]
     pub fn new_bigint(&self, i: &BigInt) -> PyIntRef {
         if let Some(i) = i.to_i32() {
-            if i >= Self::INT_CACHE_POOL_MIN && i <= Self::INT_CACHE_POOL_MAX {
+            if (Self::INT_CACHE_POOL_MIN..=Self::INT_CACHE_POOL_MAX).contains(&i) {
                 let inner_idx = (i - Self::INT_CACHE_POOL_MIN) as usize;
                 return self.int_cache_pool[inner_idx].clone();
             }