style: cargo fmt

discord9 · discord9 · commit 4bc2d5fb81cc · 2022-10-11T17:27:51.000+08:00
diff --git a/vm/src/object/core.rs b/vm/src/object/core.rs
@@ -1173,11 +1173,12 @@ impl PyObject {
     pub(in crate::object) unsafe fn dealloc_only(ptr: NonNull<PyObject>) {
         // sanity check
         #[cfg(feature = "gc")]
+        #[allow(unused)]
         {
             debug_assert!(ptr.as_ref().header().is_drop());
             if ptr.as_ref().header().is_dealloc() {
                 macro_rules! show_typeid {
-                    ($ID: tt, $($TY: ty),*$(,)?) => {
+                    ($ID: tt: $($TY: ty),*$(,)?) => {
                         $(
                             if TypeId::of::<$TY>()==$ID{
                                 String::from(std::stringify!($TY))
@@ -1199,9 +1200,14 @@ impl PyObject {
                     tuple::PyTupleIterator,
                 };
                 use crate::builtins::{
-                    PyBoundMethod, PyDict, PyEnumerate, PyFilter, PyFunction, PyList,
-                    PyMappingProxy, PyProperty, PySet, PySlice, PyStaticMethod, PySuper,
-                    PyTraceback, PyTuple, PyType, PyWeakProxy, PyZip,
+                    PyArithmeticError, PyAssertionError, PyAsyncGen, PyAttributeError,
+                    PyBaseException, PyBaseExceptionRef, PyBaseObject, PyBlockingIOError, PyBool,
+                    PyBoundMethod, PyBrokenPipeError, PyBufferError, PyByteArray, PyBytes,
+                    PyBytesRef, PyBytesWarning, PyChildProcessError, PyClassMethod, PyCode,
+                    PyComplex, PyConnectionAbortedError, PyConnectionError,
+                    PyConnectionRefusedError, PyDict, PyEnumerate, PyFilter, PyFunction, PyList,
+                    PyMappingProxy, PyProperty, PyRange, PySet, PySlice, PyStaticMethod, PyStr,
+                    PySuper, PyTraceback, PyTuple, PyType, PyWeakProxy, PyZip,
                 };
                 use crate::function::{ArgCallable, ArgIterable, ArgMapping, ArgSequence};
                 use crate::protocol::{
@@ -1210,19 +1216,42 @@ impl PyObject {
                 error!(
                     "typeid={:?}",
                     show_typeid!(
-                        tid, // builtin types
-                        // PyRange, PyStr is acyclic, therefore no trace needed for them
+                        tid: // builtin types
+                        PyArithmeticError,
+                        PyAssertionError,
+                        PyAsyncGen,
+                        PyAttributeError,
+                        PyBaseException,
+                        PyBaseExceptionRef,
+                        PyBaseObject,
+                        PyBlockingIOError,
+                        PyBool,
                         PyBoundMethod,
+                        PyBrokenPipeError,
+                        PyBufferError,
+                        PyByteArray,
+                        PyBytes,
+                        PyBytesRef,
+                        PyBytesWarning,
+                        PyChildProcessError,
+                        PyClassMethod,
+                        PyCode,
+                        PyComplex,
+                        PyConnectionAbortedError,
+                        PyConnectionError,
+                        PyConnectionRefusedError,
                         PyDict,
                         PyEnumerate,
                         PyFilter,
                         PyFunction,
                         PyList,
                         PyMappingProxy,
                         PyProperty,
+                        PyRange,
                         PySet,
                         PySlice,
                         PyStaticMethod,
+                        PyStr,
                         PySuper,
                         PyTraceback,
                         PyTuple,
diff --git a/vm/src/object/gc/collector_sync.rs b/vm/src/object/gc/collector_sync.rs
@@ -217,6 +217,7 @@ impl CcSync {
             }
         } else {
             // FIXME(discord9): confirm if rc==0 then should drop
+            // This is for Rust's RAII caused ref cycle's drop
             GcStatus::ShouldDrop
         }
     }
diff --git a/vm/src/object/gc/header.rs b/vm/src/object/gc/header.rs
@@ -4,11 +4,7 @@ use crate::object::gc::{deadlock_handler, CcSync, GLOBAL_COLLECTOR};
 
 #[cfg(not(feature = "threading"))]
 use rustpython_common::atomic::Radium;
-use rustpython_common::{
-    atomic::PyAtomic,
-    lock::{PyMutex, PyRwLockReadGuard},
-    rc::PyRc,
-};
+use rustpython_common::{atomic::PyAtomic, lock::PyMutex, rc::PyRc};
 
 /// Garbage collect header, containing ref count and other info, using repr(C) to stay consistent with PyInner 's repr
 #[repr(C)]

Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,7 @@ impl CcSync {`
`217`	`217`	`}`
`218`	`218`	`} else {`
`219`	`219`	`// FIXME(discord9): confirm if rc==0 then should drop`
	`220`	`+ // This is for Rust's RAII caused ref cycle's drop`
`220`	`221`	`GcStatus::ShouldDrop`
`221`	`222`	`}`
`222`	`223`	`}`