Fix PyCSimple

youknowone · youknowone · commit 14cf4e32d04b · 2025-11-29T00:22:44.000+09:00
diff --git a/crates/vm/src/stdlib/ctypes/base.rs b/crates/vm/src/stdlib/ctypes/base.rs
@@ -218,11 +218,12 @@ impl Constructor for PyCSimple {
                 _ => vm.ctx.none(), // "z" | "Z" | "P"
             }
         };
-        Ok(PyCSimple {
+        PyCSimple {
             _type_,
             value: AtomicCell::new(value),
         }
-        .to_pyobject(vm))
+        .into_ref_with_type(vm, cls)
+        .map(Into::into)
     }
 }
 
diff --git a/crates/vm/src/stdlib/ctypes/field.rs b/crates/vm/src/stdlib/ctypes/field.rs
@@ -36,7 +36,7 @@ pub struct PyCField {
 impl Representable for PyCField {
     fn repr_str(zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<String> {
         let tp_name = zelf.proto.name().to_string();
-        if zelf.bitfield_size != false {
+        if zelf.bitfield_size {
             Ok(format!(
                 "<{} type={}, ofs={byte_offset}, bit_size={bitfield_size}, bit_offset={bit_offset}",
                 zelf.name,
diff --git a/crates/vm/src/stdlib/ctypes/function.rs b/crates/vm/src/stdlib/ctypes/function.rs
@@ -13,7 +13,7 @@ use libffi::middle::{Arg, Cif, CodePtr, Type};
 use libloading::Symbol;
 use num_traits::ToPrimitive;
 use rustpython_common::lock::PyRwLock;
-use std::ffi::{self, CString, c_void};
+use std::ffi::{self, c_void};
 use std::fmt::Debug;
 
 // See also: https://github.com/python/cpython/blob/4f8bb3947cfbc20f970ff9d9531e1132a9e95396/Modules/_ctypes/callproc.c#L15
@@ -61,6 +61,7 @@ impl ArgumentType for PyTypeRef {
 
 pub trait ReturnType {
     fn to_ffi_type(&self) -> Option<Type>;
+    #[allow(clippy::wrong_self_convention)]
     fn from_ffi_type(
         &self,
         value: *mut ffi::c_void,
@@ -197,9 +198,8 @@ impl Callable for PyCFuncPtr {
         let return_type = zelf.res_type.read();
         let ffi_return_type = return_type
             .as_ref()
-            .map(|t| ReturnType::to_ffi_type(&t.clone().downcast::<PyType>().unwrap()))
-            .flatten()
-            .unwrap_or_else(|| Type::i32());
+            .and_then(|t| ReturnType::to_ffi_type(&t.clone().downcast::<PyType>().unwrap()))
+            .unwrap_or_else(Type::i32);
         let cif = Cif::new(ffi_arg_types, ffi_return_type);
 
         // Call the function
@@ -243,12 +243,12 @@ impl Representable for PyCFuncPtr {
         let index = zelf.ptr.read();
         let index = index.map(|ptr| ptr.0 as usize).unwrap_or(0);
         let type_name = zelf.class().name();
-        #[cfg(windows)]
-        {
+        if cfg!(windows) {
             let index = index - 0x1000;
-            return Ok(format!("<COM method offset {index:#x} {type_name}>"));
+            Ok(format!("<COM method offset {index:#x} {type_name}>"))
+        } else {
+            Ok(format!("<{type_name} object at {index:#x}>"))
         }
-        Ok(format!("<{type_name} object at {index:#x}>"))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -218,11 +218,12 @@ impl Constructor for PyCSimple {`
`218`	`218`	`_ => vm.ctx.none(), // "z" \| "Z" \| "P"`
`219`	`219`	`}`
`220`	`220`	`};`
`221`		`- Ok(PyCSimple {`
	`221`	`+ PyCSimple {`
`222`	`222`	`_type_,`
`223`	`223`	`value: AtomicCell::new(value),`
`224`	`224`	`}`
`225`		`- .to_pyobject(vm))`
	`225`	`+ .into_ref_with_type(vm, cls)`
	`226`	`+ .map(Into::into)`
`226`	`227`	`}`
`227`	`228`	`}`
`228`	`229`