Make mergeable

youknowone · youknowone · commit 8af105fc4ff5 · 2025-11-29T00:22:44.000+09:00
diff --git a/crates/vm/src/stdlib/ctypes.rs b/crates/vm/src/stdlib/ctypes.rs
@@ -9,7 +9,6 @@ pub(crate) mod pointer;
 pub(crate) mod structure;
 pub(crate) mod thunk;
 pub(crate) mod union;
-pub(crate) mod util;
 
 use crate::builtins::PyModule;
 use crate::class::PyClassImpl;
diff --git a/crates/vm/src/stdlib/ctypes/field.rs b/crates/vm/src/stdlib/ctypes/field.rs
@@ -8,6 +8,7 @@ use crate::{Py, PyResult, VirtualMachine};
 #[pyclass(name = "PyCFieldType", base = PyType, module = "_ctypes")]
 #[derive(PyPayload, Debug)]
 pub struct PyCFieldType {
+    #[allow(dead_code)]
     pub(super) inner: PyCField,
 }
 
@@ -122,13 +123,3 @@ impl PyCField {
         self.bit_offset
     }
 }
-
-#[inline(always)]
-pub const fn low_bit(offset: usize) -> usize {
-    offset & 0xFFFF
-}
-
-#[inline(always)]
-pub const fn high_bit(offset: usize) -> usize {
-    offset >> 16
-}
diff --git a/crates/vm/src/stdlib/ctypes/function.rs b/crates/vm/src/stdlib/ctypes/function.rs
@@ -102,10 +102,12 @@ impl ReturnType for PyNone {
 pub struct PyCFuncPtr {
     pub name: PyRwLock<Option<String>>,
     pub ptr: PyRwLock<Option<CodePtr>>,
+    #[allow(dead_code)]
     pub needs_free: AtomicCell<bool>,
     pub arg_types: PyRwLock<Option<Vec<PyTypeRef>>>,
     pub res_type: PyRwLock<Option<PyObjectRef>>,
     pub _flags_: AtomicCell<i32>,
+    #[allow(dead_code)]
     pub handler: PyObjectRef,
 }
 
diff --git a/crates/vm/src/stdlib/ctypes/pointer.rs b/crates/vm/src/stdlib/ctypes/pointer.rs
@@ -7,7 +7,8 @@ use crate::{PyObjectRef, PyResult};
 #[pyclass(name = "PyCPointerType", base = PyType, module = "_ctypes")]
 #[derive(PyPayload, Debug)]
 pub struct PyCPointerType {
-    pub inner: PyCPointer,
+    #[allow(dead_code)]
+    pub(crate) inner: PyCPointer,
 }
 
 #[pyclass]
diff --git a/crates/vm/src/stdlib/ctypes/util.rs b/crates/vm/src/stdlib/ctypes/util.rs
diff --git a/extra_tests/snippets/stdlib_ctypes.py b/extra_tests/snippets/stdlib_ctypes.py
@@ -338,19 +338,19 @@ def LoadLibrary(self, name):
         libc = cdll.LoadLibrary("libc.dylib")
         libc.rand()
         i = c_int(1)
-        print("start srand")
-        print(libc.srand(i))
-        print(test_byte_array)
+        # print("start srand")
+        # print(libc.srand(i))
+        # print(test_byte_array)
 else:
     import os
 
     libc = cdll.msvcrt
     libc.rand()
     i = c_int(1)
     print("start srand")
-    print(libc.srand(i))
-    print(test_byte_array)
-    print(test_byte_array._type_)
+    # print(libc.srand(i))
+    # print(test_byte_array)
+    # print(test_byte_array._type_)
     # print("start printf")
     # libc.printf(test_byte_array)
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ use crate::{PyObjectRef, PyResult};`
`7`	`7`	`#[pyclass(name = "PyCPointerType", base = PyType, module = "_ctypes")]`
`8`	`8`	`#[derive(PyPayload, Debug)]`
`9`	`9`	`pub struct PyCPointerType {`
`10`		`- pub inner: PyCPointer,`
	`10`	`+ #[allow(dead_code)]`
	`11`	`+ pub(crate) inner: PyCPointer,`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`#[pyclass]`