DynMemory log statements now use Debug instead of type_name::<T>()

Author: Bromeon

godot-core/src/obj/bounds.rs

@@ -208,7 +208,7 @@ impl Sealed for MemRefCounted {}
 impl Memory for MemRefCounted {}
 impl DynMemory for MemRefCounted {
     fn maybe_init_ref<T: GodotClass>(obj: &mut RawGd<T>) {
-        out!("  MemRefc::init  <{}>", std::any::type_name::<T>());
+        out!("  MemRefc::init:  {obj:?}");
         if obj.is_null() {
             return;
         }
@@ -226,7 +226,7 @@ impl DynMemory for MemRefCounted {
     }
 
     fn maybe_inc_ref<T: GodotClass>(obj: &mut RawGd<T>) {
-        out!("  MemRefc::inc   <{}>", std::any::type_name::<T>());
+        out!("  MemRefc::inc:   {obj:?}");
         if obj.is_null() {
             return;
         }
@@ -237,7 +237,7 @@ impl DynMemory for MemRefCounted {
     }
 
     unsafe fn maybe_dec_ref<T: GodotClass>(obj: &mut RawGd<T>) -> bool {
-        out!("  MemRefc::dec   <{}>", std::any::type_name::<T>());
+        out!("  MemRefc::dec:   {obj:?}");
         if obj.is_null() {
             return false;
         }
@@ -278,7 +278,7 @@ impl MemDynamic {
 impl Sealed for MemDynamic {}
 impl DynMemory for MemDynamic {
     fn maybe_init_ref<T: GodotClass>(obj: &mut RawGd<T>) {
-        out!("  MemDyn::init  <{}>", std::any::type_name::<T>());
+        out!("  MemDyn::init:  {obj:?}");
         if Self::inherits_refcounted(obj) {
             // Will call `RefCounted::init_ref()` which checks for liveness.
             out!("    MemDyn -> MemRefc");
@@ -289,15 +289,15 @@ impl DynMemory for MemDynamic {
     }
 
     fn maybe_inc_ref<T: GodotClass>(obj: &mut RawGd<T>) {
-        out!("  MemDyn::inc   <{}>", std::any::type_name::<T>());
+        out!("  MemDyn::inc:   {obj:?}");
         if Self::inherits_refcounted(obj) {
             // Will call `RefCounted::reference()` which checks for liveness.
             MemRefCounted::maybe_inc_ref(obj)
         }
     }
 
     unsafe fn maybe_dec_ref<T: GodotClass>(obj: &mut RawGd<T>) -> bool {
-        out!("  MemDyn::dec   <{}>", std::any::type_name::<T>());
+        out!("  MemDyn::dec:   {obj:?}");
         if obj
             .instance_id_unchecked()
             .is_some_and(|id| id.is_ref_counted())

godot-core/src/obj/raw_gd.rs

@@ -653,7 +653,7 @@ impl<T: GodotClass> Drop for RawGd<T> {
     fn drop(&mut self) {
         // No-op for manually managed objects
 
-        out!("RawGd::drop   <{}>", std::any::type_name::<T>());
+        out!("RawGd::drop:      {self:?}");
 
         // SAFETY: This `Gd` won't be dropped again after this.
         // If destruction is triggered by Godot, Storage already knows about it, no need to notify it
@@ -668,7 +668,7 @@ impl<T: GodotClass> Drop for RawGd<T> {
 
 impl<T: GodotClass> Clone for RawGd<T> {
     fn clone(&self) -> Self {
-        out!("RawGd::clone");
+        out!("RawGd::clone:     {self:?}  (before clone)");
 
         if self.is_null() {
             Self::null()

godot-core/src/storage/mod.rs

@@ -53,16 +53,16 @@ fn bug_inaccessible<T>(err: Box<dyn std::error::Error>) -> ! {
     )
 }
 
-fn log_construct<T>() {
+fn log_construct<T: GodotClass>(base: &Base<T::Base>) {
     out!(
-        "    Storage::construct             <{ty}>",
+        "    Storage::construct:             {base:?}  (T={ty})",
         ty = type_name::<T>()
     );
 }
 
 fn log_inc_ref<T: StorageRefCounted>(storage: &T) {
     out!(
-        "    Storage::on_inc_ref (rc={rc})     <{ty}> -- {base:?}",
+        "    Storage::on_inc_ref (rc={rc}):  {base:?}  (T={ty})",
         rc = T::godot_ref_count(storage),
         base = storage.base(),
         ty = type_name::<T>(),
@@ -71,7 +71,7 @@ fn log_inc_ref<T: StorageRefCounted>(storage: &T) {
 
 fn log_dec_ref<T: StorageRefCounted>(storage: &T) {
     out!(
-        "  | Storage::on_dec_ref (rc={rc})     <{ty}> -- {base:?}",
+        "  | Storage::on_dec_ref (rc={rc}):  {base:?}  (T={ty})",
         rc = T::godot_ref_count(storage),
         base = storage.base(),
         ty = type_name::<T>(),
@@ -80,7 +80,7 @@ fn log_dec_ref<T: StorageRefCounted>(storage: &T) {
 
 fn log_drop<T: StorageRefCounted>(storage: &T) {
     out!(
-        "    Storage::drop (rc={rc})           <{base:?}>",
+        "    Storage::drop (rc={rc}):        {base:?}",
         rc = storage.godot_ref_count(),
         base = storage.base(),
     );
@@ -92,6 +92,7 @@ fn log_drop<T: StorageRefCounted>(storage: &T) {
 #[cfg(debug_assertions)]
 use borrow_info::DebugBorrowTracker;
 
+use crate::obj::{Base, GodotClass};
 #[cfg(not(debug_assertions))]
 use borrow_info_noop::DebugBorrowTracker;
 

godot-core/src/storage/multi_threaded.rs

@@ -43,7 +43,7 @@ unsafe impl<T: GodotClass> Storage for InstanceStorage<T> {
         user_instance: Self::Instance,
         base: Base<<Self::Instance as GodotClass>::Base>,
     ) -> Self {
-        super::log_construct::<T>();
+        super::log_construct::<T>(&base);
 
         Self {
             user_instance: GdCell::new(user_instance),

godot-core/src/storage/single_threaded.rs

@@ -43,7 +43,7 @@ unsafe impl<T: GodotClass> Storage for InstanceStorage<T> {
         user_instance: Self::Instance,
         base: Base<<Self::Instance as GodotClass>::Base>,
     ) -> Self {
-        super::log_construct::<T>();
+        super::log_construct::<T>(&base);
 
         Self {
             user_instance: GdCell::new(user_instance),