apply review

youknowone · youknowone · commit 39e6885e0ea9 · 2025-11-29T11:32:21.000+09:00
diff --git a/crates/vm/src/stdlib/ctypes.rs b/crates/vm/src/stdlib/ctypes.rs
@@ -350,9 +350,10 @@ pub(crate) mod _ctypes {
         if !obj.fast_isinstance(PyCData::static_type())
             && !obj.fast_isinstance(PyCSimple::static_type())
         {
-            return Err(vm.new_type_error(
-                "byref() argument must be a ctypes instance, not 'int'".to_string(),
-            ));
+            return Err(vm.new_type_error(format!(
+                "byref() argument must be a ctypes instance, not '{}'",
+                obj.class().name()
+            )));
         }
 
         let offset_val = offset.unwrap_or(0);
@@ -428,14 +429,12 @@ pub(crate) mod _ctypes {
         }
         #[cfg(target_os = "windows")]
         {
-            // On Windows, use wcslen from ucrt
-            0
+            todo!("On Windows, use wcslen from ucrt")
         }
     }
 
     #[pyattr]
     fn _cast_addr(_vm: &VirtualMachine) -> usize {
-        // TODO: RUSTPYTHON
-        0
+        todo!("Implement _cast_addr")
     }
 }
diff --git a/crates/vm/src/stdlib/ctypes/array.rs b/crates/vm/src/stdlib/ctypes/array.rs
@@ -404,7 +404,10 @@ impl PyCArray {
 impl PyCArray {
     #[allow(unused)]
     pub fn to_arg(&self, _vm: &VirtualMachine) -> PyResult<libffi::middle::Arg> {
+        // TODO: This needs a different approach to ensure buffer lifetime
+        // The buffer must outlive the Arg returned here
         let buffer = self.buffer.read();
-        Ok(libffi::middle::Arg::new(&buffer.clone()))
+        let ptr = buffer.as_ptr();
+        Ok(libffi::middle::Arg::new(&ptr))
     }
 }
diff --git a/crates/vm/src/stdlib/ctypes/structure.rs b/crates/vm/src/stdlib/ctypes/structure.rs
@@ -8,9 +8,9 @@ use crate::stdlib::ctypes::_ctypes::get_size;
 use crate::types::{AsNumber, Constructor};
 use crate::{AsObject, PyObjectRef, PyPayload, PyResult, VirtualMachine};
 use crossbeam_utils::atomic::AtomicCell;
+use indexmap::IndexMap;
 use num_traits::ToPrimitive;
 use rustpython_common::lock::PyRwLock;
-use std::collections::HashMap;
 use std::fmt::Debug;
 
 /// PyCStructType - metaclass for Structure
@@ -139,6 +139,7 @@ impl PyCStructType {
         if n < 0 {
             return Err(vm.new_value_error(format!("Array length must be >= 0, not {n}")));
         }
+        // TODO: Calculate element size properly
         // For structures, element size is the structure size (sum of field sizes)
         let element_size = std::mem::size_of::<usize>(); // Default, should calculate from fields
         Ok(PyCArrayType {
@@ -196,7 +197,7 @@ pub struct PyCStructure {
     pub(super) buffer: PyRwLock<Vec<u8>>,
     /// Field information (name -> FieldInfo)
     #[allow(dead_code)]
-    pub(super) fields: PyRwLock<HashMap<String, FieldInfo>>,
+    pub(super) fields: PyRwLock<IndexMap<String, FieldInfo>>,
     /// Total size of the structure
     pub(super) size: AtomicCell<usize>,
 }
@@ -216,7 +217,7 @@ impl Constructor for PyCStructure {
         // Get _fields_ from the class using get_attr to properly search MRO
         let fields_attr = cls.as_object().get_attr("_fields_", vm).ok();
 
-        let mut fields_map = HashMap::new();
+        let mut fields_map = IndexMap::new();
         let mut total_size = 0usize;
 
         if let Some(fields_attr) = fields_attr {

Original file line number	Diff line number	Diff line change
`@@ -350,9 +350,10 @@ pub(crate) mod _ctypes {`
`350`	`350`	`if !obj.fast_isinstance(PyCData::static_type())`
`351`	`351`	`&& !obj.fast_isinstance(PyCSimple::static_type())`
`352`	`352`	`{`
`353`		`- return Err(vm.new_type_error(`
`354`		`- "byref() argument must be a ctypes instance, not 'int'".to_string(),`
`355`		`- ));`
	`353`	`+ return Err(vm.new_type_error(format!(`
	`354`	`+ "byref() argument must be a ctypes instance, not '{}'",`
	`355`	`+ obj.class().name()`
	`356`	`+ )));`
`356`	`357`	`}`
`357`	`358`
`358`	`359`	`let offset_val = offset.unwrap_or(0);`
`@@ -428,14 +429,12 @@ pub(crate) mod _ctypes {`
`428`	`429`	`}`
`429`	`430`	`#[cfg(target_os = "windows")]`
`430`	`431`	`{`
`431`		`- // On Windows, use wcslen from ucrt`
`432`		`- 0`
	`432`	`+ todo!("On Windows, use wcslen from ucrt")`
`433`	`433`	`}`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`#[pyattr]`
`437`	`437`	`fn _cast_addr(_vm: &VirtualMachine) -> usize {`
`438`		`- // TODO: RUSTPYTHON`
`439`		`- 0`
	`438`	`+ todo!("Implement _cast_addr")`
`440`	`439`	`}`
`441`	`440`	`}`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,10 @@ impl PyCArray {`
`404`	`404`	`impl PyCArray {`
`405`	`405`	`#[allow(unused)]`
`406`	`406`	`pub fn to_arg(&self, _vm: &VirtualMachine) -> PyResult<libffi::middle::Arg> {`
	`407`	`+ // TODO: This needs a different approach to ensure buffer lifetime`
	`408`	`+ // The buffer must outlive the Arg returned here`
`407`	`409`	`let buffer = self.buffer.read();`
`408`		`- Ok(libffi::middle::Arg::new(&buffer.clone()))`
	`410`	`+ let ptr = buffer.as_ptr();`
	`411`	`+ Ok(libffi::middle::Arg::new(&ptr))`
`409`	`412`	`}`
`410`	`413`	`}`