Merge pull request RustPython#438 from ZapAnton/fix_clippy

Fixed several small clippy warnings

Author: cthulahoops

vm/src/compile.rs

@@ -163,7 +163,7 @@ impl Compiler {
                         _ => {
                             self.emit(Instruction::Import {
                                 name: module.clone(),
-                                symbol: symbol.clone().map(|s| s.clone()),
+                                symbol: symbol.clone(),
                             });
                             self.emit(Instruction::StoreName {
                                 name: match alias {

vm/src/obj/objsequence.rs

@@ -49,7 +49,7 @@ pub trait PySliceableSequence {
         let stop = stop
             .as_ref()
             .map(|x| self.get_slice_pos(x))
-            .unwrap_or(self.len());
+            .unwrap_or_else(|| self.len());
 
         start..stop
     }
@@ -65,7 +65,7 @@ pub trait PySliceableSequence {
         // TODO: we could potentially avoid this copy and use slice
         match &(slice.borrow()).payload {
             PyObjectPayload::Slice { start, stop, step } => {
-                let step = step.clone().unwrap_or(BigInt::one());
+                let step = step.clone().unwrap_or_else(BigInt::one);
                 if step.is_zero() {
                     Err(vm.new_value_error("slice step cannot be zero".to_string()))
                 } else if step.is_positive() {

vm/src/obj/objstr.rs

@@ -823,18 +823,13 @@ fn str_ljust(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 fn str_istitle(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(s, Some(vm.ctx.str_type()))]);
     let value = get_value(&s);
-    let mut is_titled = true;
 
-    if value.is_empty() {
-        is_titled = false;
+    let is_titled = if value.is_empty() {
+        false
     } else {
-        for word in value.split(' ') {
-            if word != make_title(&word) {
-                is_titled = false;
-                break;
-            }
-        }
-    }
+        value.split(' ').all(|word| word == make_title(word))
+    };
+
     Ok(vm.ctx.new_bool(is_titled))
 }
 
@@ -974,24 +969,15 @@ fn str_isdigit(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let valid_unicodes: [u16; 10] = [
         0x2070, 0x00B9, 0x00B2, 0x00B3, 0x2074, 0x2075, 0x2076, 0x2077, 0x2078, 0x2079,
     ];
-    let mut is_digit: bool = true;
 
-    if value.is_empty() {
-        is_digit = false;
+    let is_digit = if value.is_empty() {
+        false
     } else {
-        for c in value.chars() {
-            if !c.is_digit(10) {
-                // checking if char is exponent
-                let char_as_uni: u16 = c as u16;
-                if valid_unicodes.contains(&char_as_uni) {
-                    continue;
-                } else {
-                    is_digit = false;
-                    break;
-                }
-            }
-        }
-    }
+        value
+            .chars()
+            .filter(|c| !c.is_digit(10))
+            .all(|c| valid_unicodes.contains(&(c as u16)))
+    };
 
     Ok(vm.ctx.new_bool(is_digit))
 }

vm/src/obj/objzip.rs

@@ -10,7 +10,7 @@ fn zip_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let cls = &args.args[0];
     let iterables = &args.args[1..];
     let iterators = iterables
-        .into_iter()
+        .iter()
         .map(|iterable| objiter::get_iter(vm, iterable))
         .collect::<Result<Vec<_>, _>>()?;
     Ok(PyObject::new(

vm/src/pyobject.rs

@@ -736,7 +736,7 @@ pub trait AttributeProtocol {
 fn class_get_item(class: &PyObjectRef, attr_name: &str) -> Option<PyObjectRef> {
     let class = class.borrow();
     match class.payload {
-        PyObjectPayload::Class { ref dict, .. } => dict.borrow().get(attr_name).map(|v| v.clone()),
+        PyObjectPayload::Class { ref dict, .. } => dict.borrow().get(attr_name).cloned(),
         _ => panic!("Only classes should be in MRO!"),
     }
 }
@@ -765,9 +765,7 @@ impl AttributeProtocol for PyObjectRef {
                 }
                 None
             }
-            PyObjectPayload::Instance { ref dict } => {
-                dict.borrow().get(attr_name).map(|v| v.clone())
-            }
+            PyObjectPayload::Instance { ref dict } => dict.borrow().get(attr_name).cloned(),
             _ => None,
         }
     }

vm/src/stdlib/os.rs

@@ -20,7 +20,7 @@ use super::super::vm::VirtualMachine;
 pub fn raw_file_number(handle: File) -> i64 {
     use std::os::unix::io::IntoRawFd;
 
-    handle.into_raw_fd() as i64
+    i64::from(handle.into_raw_fd())
 }
 
 #[cfg(target_family = "unix")]

vm/src/stdlib/pystruct.rs

@@ -287,7 +287,7 @@ fn unpack_u64(vm: &mut VirtualMachine, rdr: &mut Read) -> PyResult {
 fn unpack_f32(vm: &mut VirtualMachine, rdr: &mut Read) -> PyResult {
     match rdr.read_f32::<LittleEndian>() {
         Err(err) => panic!("Error in reading {:?}", err),
-        Ok(v) => Ok(vm.ctx.new_float(v as f64)),
+        Ok(v) => Ok(vm.ctx.new_float(f64::from(v))),
     }
 }
 

vm/src/stdlib/time_module.rs

@@ -17,7 +17,7 @@ fn time_sleep(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 }
 
 fn duration_to_f64(d: Duration) -> f64 {
-    (d.as_secs() as f64) + ((d.subsec_nanos() as f64) / 1e9)
+    (d.as_secs() as f64) + (f64::from(d.subsec_nanos()) / 1e9)
 }
 
 fn time_time(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {

vm/src/vm.rs

@@ -430,14 +430,12 @@ impl VirtualMachine {
 
             // We have sufficient defaults, so iterate over the corresponding names and use
             // the default if we don't already have a value
-            let mut default_index = 0;
-            for i in required_args..nexpected_args {
+            for (default_index, i) in (required_args..nexpected_args).enumerate() {
                 let arg_name = &code_object.arg_names[i];
                 if !scope.contains_key(arg_name) {
                     self.ctx
                         .set_item(scope, arg_name, available_defaults[default_index].clone());
                 }
-                default_index += 1;
             }
         };