clippy

RustPython · youknowone · Mar 25, 2025 · Mar 3, 2025 · Mar 3, 2025 · Mar 4, 2025
commit aa2fa5f6fb100052ecfb91cf3ea21ba7425658ad
diff --git a/vm/src/stdlib/ctypes.rs b/vm/src/stdlib/ctypes.rs
@@ -253,19 +253,19 @@ pub(crate) mod _ctypes {
     #[pyfunction]
     fn byref(_args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> {
         // TODO: RUSTPYTHON
-        return Err(vm.new_value_error("not implemented".to_string()));
+        Err(vm.new_value_error("not implemented".to_string()))
     }
 
     #[pyfunction]
     fn alignment(_args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> {
         // TODO: RUSTPYTHON
-        return Err(vm.new_value_error("not implemented".to_string()));
+        Err(vm.new_value_error("not implemented".to_string()))
     }
 
     #[pyfunction]
     fn resize(_args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> {
         // TODO: RUSTPYTHON
-        return Err(vm.new_value_error("not implemented".to_string()));
+        Err(vm.new_value_error("not implemented".to_string()))
     }
 
     #[pyfunction]
@@ -312,6 +312,6 @@ pub(crate) mod _ctypes {
     #[pyattr]
     fn _cast_addr(_vm: &VirtualMachine) -> usize {
         // TODO: RUSTPYTHON
-        return 0;
+        0
     }
 }
diff --git a/vm/src/stdlib/ctypes/array.rs b/vm/src/stdlib/ctypes/array.rs
@@ -29,7 +29,7 @@ impl Callable for PyCArrayType {
             length: AtomicCell::new(zelf.inner.length.load()),
             value: PyRwLock::new(zelf.inner.value.read().clone()),
         }
-        .into_pyobject(&vm))
+        .into_pyobject(vm))
     }
 }
 
@@ -70,7 +70,7 @@ impl Constructor for PyCArray {
             length: AtomicCell::new(args.1),
             value: PyRwLock::new(vm.ctx.none()),
         }
-        .into_pyobject(&vm))
+        .into_pyobject(vm))
     }
 }
 

diff --git a/vm/src/stdlib/ctypes/function.rs b/vm/src/stdlib/ctypes/function.rs
@@ -44,9 +44,7 @@ impl Function {
                     let converted = ffi_type_from_str(&arg._type_);
                     return match converted {
                         Some(t) => Ok(t),
-                        None => Err(vm.new_type_error(format!(
-                            "Invalid type" // TODO: add type name
-                        ))),
+                        None => Err(vm.new_type_error("Invalid type".to_string())), // TODO: add type name
                     };
                 }
                 if let Some(arg) = arg.payload_if_subclass::<PyCArray>(vm) {
@@ -65,15 +63,13 @@ impl Function {
                         })?
                         .to_string();
                     let converted = ffi_type_from_str(&ty_str);
-                    return match converted {
+                    match converted {
                         Some(_t) => {
                             // TODO: Use
                             Ok(Type::void())
                         }
-                        None => Err(vm.new_type_error(format!(
-                            "Invalid type" // TODO: add type name
-                        ))),
-                    };
+                        None => Err(vm.new_type_error("Invalid type".to_string())), // TODO: add type name
+                    }
                 } else {
                     Err(vm.new_type_error("Expected a ctypes simple type".to_string()))
                 }
@@ -190,7 +186,9 @@ impl Callable for PyCFuncPtr {
             let name = zelf.name.read();
             let res_type = zelf._restype_.read();
             let func = Function::load(
-                inner_lib.as_ref().unwrap(),
+                inner_lib.as_ref().ok_or_else(|| {
+                    vm.new_value_error("Library not found".to_string())
+                })?,
                 &name,
                 &args.args,
                 &res_type,