fix more errors

arihant2math · arihant2math · commit bcd85bb7350e · 2025-01-20T17:44:15.000-08:00
Signed-off-by: Ashwin Naren &lt;arihant2math@gmail.com&gt;
diff --git a/vm/src/stdlib/ctypes/array.rs b/vm/src/stdlib/ctypes/array.rs
@@ -22,7 +22,7 @@ use std::fmt;
 use widestring::WideCString;
 use crate::class::StaticType;
 use crate::convert::IntoObject;
-use crate::protocol::PyBuffer;
+use crate::protocol::{PyBuffer, PyIter};
 
 // TODO: make sure that this is correct wrt windows and unix wstr
 fn slice_to_obj(ty: &str, b: &[u8], vm: &VirtualMachine) -> PyResult {
@@ -209,7 +209,7 @@ fn array_slice_getitem<'a>(
     let mut obj_vec = Vec::new();
     let mut offset;
 
-    for curr in PyIterable::try_from_object(vm,_range.into_object(vm))?.iter(vm)? {
+    for curr in PyIter::try_from_object(vm,_range.into_object(vm))?.iter(vm)? {
         let idx = fix_index(isize::try_from_object(vm, curr?)?, length, vm)? as usize;
         offset = idx * size;
 
@@ -408,7 +408,7 @@ impl PyCArrayMeta {
             Err(vm.new_value_error("The '_length_' attribute must not be negative".to_string()))
         } else {
             Ok(
-                builtins::int::try_to_primitive(length_int.as_bigint(), vm).map_err(|_| {
+                try_to_primitive(length_int.as_bigint(), vm).map_err(|_| {
                     vm.new_overflow_error("The '_length_' attribute is too large".to_owned())
                 })?,
             )
diff --git a/vm/src/stdlib/ctypes/basics.rs b/vm/src/stdlib/ctypes/basics.rs
@@ -12,6 +12,7 @@ use crate::{PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine};
 use crate::stdlib::ctypes::array::make_array_with_length;
 use crate::stdlib::ctypes::dll::dlsym;
 use crate::stdlib::ctypes::primitive::{new_simple_type, PyCSimple};
+use crate::function::Either;
 
 use crate::builtins::PyTypeRef;
 use crate::protocol::PyBuffer;
@@ -364,12 +365,6 @@ impl fmt::Debug for RawBuffer {
     }
 }
 
-impl PyPayload for RawBuffer {
-    fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.object_type
-    }
-}
-
 unsafe impl Send for RawBuffer {}
 unsafe impl Sync for RawBuffer {}
 
@@ -388,12 +383,6 @@ impl fmt::Debug for PyCData {
     }
 }
 
-impl PyPayload for PyCData {
-    fn class(_vm: &VirtualMachine) -> &PyTypeRef {
-        Self::static_type()
-    }
-}
-
 impl PyCData {
     pub fn new(objs: Option<Vec<PyObjectRef>>, buffer: Option<RawBuffer>) -> Self {
         PyCData {
diff --git a/vm/src/stdlib/ctypes/dll.rs b/vm/src/stdlib/ctypes/dll.rs
@@ -4,7 +4,7 @@ pub(crate) use _ctypes::*;
 pub(crate) mod _ctypes {
     use crate::builtins::pystr::PyStrRef;
     use crate::builtins::PyIntRef;
-    use crate::VirtualMachine;
+    use crate::{TryFromObject, PyResult, VirtualMachine};
 
     use super::super::shared_lib::libcache;
 
diff --git a/vm/src/stdlib/ctypes/function.rs b/vm/src/stdlib/ctypes/function.rs
@@ -254,12 +254,6 @@ impl fmt::Debug for PyCFuncPtr {
     }
 }
 
-impl PyPayload for PyCFuncPtr {
-    fn class(_vm: &VirtualMachine) -> &PyTypeRef {
-        Self::static_type()
-    }
-}
-
 #[pyclass(with(Callable), flags(BASETYPE))]
 impl PyCFuncPtr {
     #[pygetset(name = "_argtypes_")]
@@ -400,7 +394,9 @@ impl PyCFuncPtr {
 }
 
 impl Callable for PyCFuncPtr {
-    fn call(zelf: &PyRef<Self>, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
+    type Args = FuncArgs;
+
+    fn call(zelf: &PyRef<Self>, args: Self::Args, vm: &VirtualMachine) -> PyResult {
         let inner_args = unsafe { &*zelf._argtypes_.as_ptr() };
 
         if args.args.len() != inner_args.len() {
diff --git a/vm/src/stdlib/ctypes/mod.rs b/vm/src/stdlib/ctypes/mod.rs
@@ -10,10 +10,9 @@ mod shared_lib;
 mod structure;
 mod union;
 
-use array::{PyCArray, PyCArrayMeta};
-use basics::{addressof, alignment, byref, sizeof_func, PyCData};
-use primitive::{PyCSimple, PySimpleMeta};
-use structure::PyCStructure;
+use array::PyCArrayMeta;
+use basics::PyCData;
+use primitive::PySimpleMeta;
 use crate::class::PyClassImpl;
 use crate::convert::IntoObject;
 
@@ -23,6 +22,7 @@ mod _ctypes {
     use crate::function::Either;
     use crate::builtins::PyTypeRef;
     use crate::{PyObjectRef, PyResult, VirtualMachine};
+    use crate::stdlib::ctypes::pointer;
 
     #[pyattr(name="__version__")]
     pub(crate) fn version() -> &'static str {
@@ -50,22 +50,23 @@ mod _ctypes {
     }
 
     #[pyfunction]
-    pub(crate) fn POINTER(tp: Either<PyTypeRef, PyObjectRef>, vm: &VirtualMachine) -> PyResult {
-        basics::POINTER(tp, vm)
+    pub(crate) fn POINTER(tp: PyTypeRef, vm: &VirtualMachine) -> PyResult {
+        pointer::POINTER(tp);
+        Ok(vm.get_none())
     }
 
     #[pyfunction]
     pub(crate) fn pointer(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult {
-        basics::pointer_fn(obj, vm)
+        pointer::pointer_fn(obj);
+        Ok(vm.get_none())
     }
 
     #[pyfunction]
     pub(crate) fn _pointer_type_cache(vm: &VirtualMachine) -> PyResult {
         Ok(PyObjectRef::from(vm.ctx.new_dict()))
     }
 
-    #[pyclass(name = "CFuncPtr")]
-    pub(crate) struct CFuncPtr {}
+    // TODO: add the classes
 }
 
 pub(crate) fn make_module(vm: &VirtualMachine) -> PyObjectRef {
diff --git a/vm/src/stdlib/ctypes/pointer.rs b/vm/src/stdlib/ctypes/pointer.rs
@@ -1,7 +1,7 @@
 use std::fmt;
 
+use crate::PyObjectRef;
 use crate::builtins::PyTypeRef;
-use crate::VirtualMachine;
 
 use crate::stdlib::ctypes::basics::PyCData;
 
@@ -14,12 +14,6 @@ impl fmt::Debug for PyCPointer {
     }
 }
 
-impl PyPayload for PyCPointer {
-    fn class(_vm: &VirtualMachine) -> &PyTypeRef {
-        Self::static_type()
-    }
-}
-
 // impl PyCDataMethods for PyCPointer {
 //     fn from_param(zelf: PyRef<Self>, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
 
diff --git a/vm/src/stdlib/ctypes/primitive.rs b/vm/src/stdlib/ctypes/primitive.rs
@@ -14,6 +14,7 @@ use crate::stdlib::ctypes::basics::{
 };
 use crate::stdlib::ctypes::function::PyCFuncPtr;
 use crate::stdlib::ctypes::pointer::PyCPointer;
+use crate::function::Either;
 use crate::{PyObjectRef, PyRef, PyResult, VirtualMachine};
 use crate::protocol::PyBuffer;
 
@@ -305,18 +306,6 @@ impl fmt::Debug for PySimpleMeta {
     }
 }
 
-impl PyPayload for PyCSimple {
-    fn class(_vm: &VirtualMachine) -> &PyTypeRef {
-        Self::static_type()
-    }
-}
-
-impl PyPayload for PySimpleMeta {
-    fn class(_vm: &VirtualMachine) -> &PyTypeRef {
-        Self::static_type()
-    }
-}
-
 impl PyCDataMethods for PySimpleMeta {
     // From PyCSimpleType_Type PyCSimpleType_methods
     fn from_param(
diff --git a/vm/src/stdlib/ctypes/shared_lib.rs b/vm/src/stdlib/ctypes/shared_lib.rs
@@ -3,7 +3,6 @@ use std::{collections::HashMap, fmt, os::raw::c_void, ptr::null};
 use crossbeam_utils::atomic::AtomicCell;
 use libloading::Library;
 
-use crate::builtins::PyTypeRef;
 use crate::common::lock::PyRwLock;
 use crate::{PyPayload, PyRef, VirtualMachine};
 pub struct SharedLibrary {
@@ -22,12 +21,6 @@ impl fmt::Debug for SharedLibrary {
     }
 }
 
-impl PyPayload for SharedLibrary {
-    fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.object_type
-    }
-}
-
 impl SharedLibrary {
     pub fn new(name: &str) -> Result<SharedLibrary, libloading::Error> {
         Ok(SharedLibrary {
diff --git a/vm/src/stdlib/ctypes/structure.rs b/vm/src/stdlib/ctypes/structure.rs
@@ -1,7 +1,4 @@
 use std::fmt;
-use rustpython_vm::PyPayload;
-use crate::builtins::PyTypeRef;
-use crate::VirtualMachine;
 
 use crate::stdlib::ctypes::basics::PyCData;
 
@@ -14,11 +11,5 @@ impl fmt::Debug for PyCStructure {
     }
 }
 
-impl PyPayload for PyCStructure {
-    fn class(_vm: &VirtualMachine) -> &PyTypeRef {
-        Self::static_type()
-    }
-}
-
 #[pyclass(flags(BASETYPE))]
 impl PyCStructure {}
