Fix a bunch of clippy lints

Author: coolreader18

vm/src/bytecode.rs

@@ -269,7 +269,7 @@ impl CodeObject {
         }
     }
 
-    pub fn get_constants<'a>(&'a self) -> impl Iterator<Item = &'a Constant> {
+    pub fn get_constants(&self) -> impl Iterator<Item = &Constant> {
         self.instructions.iter().filter_map(|x| {
             if let Instruction::LoadConst { value } = x {
                 Some(value)
@@ -362,10 +362,7 @@ impl Instruction {
             UnpackSequence { size } => w!(UnpackSequence, size),
             UnpackEx { before, after } => w!(UnpackEx, before, after),
             Unpack => w!(Unpack),
-            FormatValue {
-                conversion: _,
-                spec,
-            } => w!(FormatValue, spec), // TODO: write conversion
+            FormatValue { spec, .. } => w!(FormatValue, spec), // TODO: write conversion
         }
     }
 }

vm/src/compile.rs

@@ -48,10 +48,7 @@ pub fn compile(
 
     let code = compiler.pop_code_object();
     trace!("Compilation completed: {:?}", code);
-    Ok(PyObject::new(
-        PyObjectPayload::Code { code: code },
-        code_type,
-    ))
+    Ok(PyObject::new(PyObjectPayload::Code { code }, code_type))
 }
 
 pub enum Mode {

vm/src/frame.rs

@@ -94,7 +94,7 @@ impl Frame {
         let run_obj_name = &self.code.obj_name.to_string();
 
         // Execute until return or exception:
-        let value = loop {
+        loop {
             let lineno = self.get_lineno();
             let result = self.execute_instruction(vm);
             match result {
@@ -136,9 +136,7 @@ impl Frame {
                     }
                 }
             }
-        };
-
-        value
+        }
     }
 
     pub fn fetch_instruction(&self) -> &bytecode::Instruction {

vm/src/import.rs

@@ -105,7 +105,7 @@ fn find_source(vm: &VirtualMachine, current_path: PathBuf, name: &str) -> Result
         }
     }
 
-    match file_paths.iter().filter(|p| p.exists()).next() {
+    match file_paths.iter().find(|p| p.exists()) {
         Some(path) => Ok(path.to_path_buf()),
         None => Err(format!("No module named '{}'", name)),
     }

vm/src/lib.rs

@@ -5,6 +5,9 @@
 //! - Import mechanics
 //! - Base objects
 
+// for methods like vm.to_str(), not the typical use of 'to' as a method prefix
+#![allow(clippy::wrong_self_convention)]
+
 #[macro_use]
 extern crate bitflags;
 #[macro_use]

vm/src/obj/objbool.rs

@@ -22,12 +22,10 @@ pub fn boolval(vm: &mut VirtualMachine, obj: PyObjectRef) -> Result<bool, PyObje
         _ => {
             if let Ok(f) = vm.get_method(obj.clone(), "__bool__") {
                 let bool_res = vm.invoke(f, PyFuncArgs::default())?;
-                let v = match bool_res.payload {
+                match bool_res.payload {
                     PyObjectPayload::Integer { ref value } => !value.is_zero(),
                     _ => return Err(vm.new_type_error(String::from("TypeError"))),
-                };
-
-                v
+                }
             } else {
                 true
             }

vm/src/obj/objcomplex.rs

@@ -84,13 +84,13 @@ fn complex_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
 fn complex_real(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(zelf, Some(vm.ctx.complex_type()))]);
-    let Complex64 { re, im: _ } = get_value(zelf);
+    let Complex64 { re, .. } = get_value(zelf);
     Ok(vm.ctx.new_float(re))
 }
 
 fn complex_imag(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(zelf, Some(vm.ctx.complex_type()))]);
-    let Complex64 { re: _, im } = get_value(zelf);
+    let Complex64 { im, .. } = get_value(zelf);
     Ok(vm.ctx.new_float(im))
 }
 

vm/src/obj/objgenerator.rs

@@ -29,7 +29,7 @@ pub fn init(context: &PyContext) {
 
 pub fn new_generator(vm: &mut VirtualMachine, frame: PyObjectRef) -> PyResult {
     Ok(PyObject::new(
-        PyObjectPayload::Generator { frame: frame },
+        PyObjectPayload::Generator { frame },
         vm.ctx.generator_type.clone(),
     ))
 }

vm/src/obj/objset.rs

@@ -547,7 +547,7 @@ fn set_ixor(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 fn set_iter(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(zelf, Some(vm.ctx.set_type()))]);
 
-    let items = get_elements(zelf).values().map(|x| x.clone()).collect();
+    let items = get_elements(zelf).values().cloned().collect();
     let set_list = vm.ctx.new_list(items);
     let iter_obj = PyObject::new(
         PyObjectPayload::Iterator {

vm/src/obj/objstr.rs

@@ -518,7 +518,7 @@ fn str_isupper(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
             && value
                 .chars()
                 .filter(|x| !x.is_ascii_whitespace())
-                .all(|c| c.is_uppercase()),
+                .all(char::is_uppercase),
     ))
 }
 
@@ -530,7 +530,7 @@ fn str_islower(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
             && value
                 .chars()
                 .filter(|x| !x.is_ascii_whitespace())
-                .all(|c| c.is_lowercase()),
+                .all(char::is_lowercase),
     ))
 }
 
@@ -895,7 +895,7 @@ fn str_isalnum(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let value = get_value(&s);
     Ok(vm
         .ctx
-        .new_bool(!value.is_empty() && value.chars().all(|c| c.is_alphanumeric())))
+        .new_bool(!value.is_empty() && value.chars().all(char::is_alphanumeric)))
 }
 
 fn str_isascii(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
@@ -959,15 +959,15 @@ fn str_isnumeric(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let value = get_value(&s);
     Ok(vm
         .ctx
-        .new_bool(!value.is_empty() && value.chars().all(|c| c.is_numeric())))
+        .new_bool(!value.is_empty() && value.chars().all(char::is_numeric)))
 }
 
 fn str_isalpha(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args, required = [(s, Some(vm.ctx.str_type()))]);
     let value = get_value(&s);
     Ok(vm
         .ctx
-        .new_bool(!value.is_empty() && value.chars().all(|c| c.is_alphanumeric())))
+        .new_bool(!value.is_empty() && value.chars().all(char::is_alphanumeric)))
 }
 
 fn str_isdigit(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {