clippy

youknowone · youknowone · commit 3009d91ec01f · 2026-01-18T22:10:51.000+09:00
diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs
@@ -93,7 +93,7 @@ pub(super) unsafe fn debug_obj<T: PyPayload + core::fmt::Debug>(
 }
 
 /// Call `try_trace` on payload
-pub(super) unsafe fn try_trace_obj<T: PyPayload>(x: &PyObject, tracer_fn: &mut TraverseFn<'_>) {
+pub(super) unsafe fn try_traverse_obj<T: PyPayload>(x: &PyObject, tracer_fn: &mut TraverseFn<'_>) {
     let x = unsafe { &*(x as *const PyObject as *const PyInner<T>) };
     let payload = &x.payload;
     payload.try_traverse(tracer_fn)
@@ -124,12 +124,6 @@ bitflags::bitflags! {
     }
 }
 
-/// Call `try_clear` on payload to extract child references (tp_clear)
-pub(super) unsafe fn try_clear_obj<T: PyPayload>(x: *mut PyObject, out: &mut Vec<PyObjectRef>) {
-    let x = unsafe { &mut *(x as *mut PyInner<T>) };
-    x.payload.try_clear(out);
-}
-
 /// This is an actual python object. It consists of a `typ` which is the
 /// python class, and carries some rust payload optionally. This rust
 /// payload can be a rust float or rust int in case of float and int objects.
diff --git a/crates/vm/src/object/traverse_object.rs b/crates/vm/src/object/traverse_object.rs
@@ -2,10 +2,10 @@ use alloc::fmt;
 use core::any::TypeId;
 
 use crate::{
-    PyObject, PyObjectRef,
+    PyObject,
     object::{
         Erased, InstanceDict, MaybeTraverse, PyInner, PyObjectPayload, debug_obj, drop_dealloc_obj,
-        try_clear_obj, try_trace_obj,
+        try_traverse_obj,
     },
 };
 
@@ -16,9 +16,6 @@ pub(in crate::object) struct PyObjVTable {
     pub(in crate::object) drop_dealloc: unsafe fn(*mut PyObject),
     pub(in crate::object) debug: unsafe fn(&PyObject, &mut fmt::Formatter<'_>) -> fmt::Result,
     pub(in crate::object) trace: Option<unsafe fn(&PyObject, &mut TraverseFn<'_>)>,
-    /// Clear for circular reference resolution (tp_clear).
-    /// Called just before deallocation to extract child references.
-    pub(in crate::object) clear: Option<unsafe fn(*mut PyObject, &mut Vec<PyObjectRef>)>,
 }
 
 impl PyObjVTable {
@@ -29,14 +26,7 @@ impl PyObjVTable {
             debug: debug_obj::<T>,
             trace: const {
                 if T::HAS_TRAVERSE {
-                    Some(try_trace_obj::<T>)
-                } else {
-                    None
-                }
-            },
-            clear: const {
-                if T::HAS_CLEAR {
-                    Some(try_clear_obj::<T>)
+                    Some(try_traverse_obj::<T>)
                 } else {
                     None
                 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ pub(super) unsafe fn debug_obj<T: PyPayload + core::fmt::Debug>(`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	/// Call `try_trace` on payload
`96`		`-pub(super) unsafe fn try_trace_obj<T: PyPayload>(x: &PyObject, tracer_fn: &mut TraverseFn<'_>) {`
	`96`	`+pub(super) unsafe fn try_traverse_obj<T: PyPayload>(x: &PyObject, tracer_fn: &mut TraverseFn<'_>) {`
`97`	`97`	`let x = unsafe { &(x as const PyObject as *const PyInner<T>) };`
`98`	`98`	`let payload = &x.payload;`
`99`	`99`	`payload.try_traverse(tracer_fn)`
`@@ -124,12 +124,6 @@ bitflags::bitflags! {`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`127`		-/// Call `try_clear` on payload to extract child references (tp_clear)
`128`		`-pub(super) unsafe fn try_clear_obj<T: PyPayload>(x: *mut PyObject, out: &mut Vec<PyObjectRef>) {`
`129`		`- let x = unsafe { &mut (x as mut PyInner<T>) };`
`130`		`- x.payload.try_clear(out);`
`131`		`-}`
`132`		`-`
`133`	`127`	/// This is an actual python object. It consists of a `typ` which is the
`134`	`128`	`/// python class, and carries some rust payload optionally. This rust`
`135`	`129`	`/// payload can be a rust float or rust int in case of float and int objects.`