simplify memory leak logging

CrazyboyQCD · CrazyboyQCD · commit 457411a2b49b · 2025-02-27T09:30:58.000+08:00
diff --git a/src/allocator/dedicated_block_allocator/mod.rs b/src/allocator/dedicated_block_allocator/mod.rs
@@ -104,15 +104,14 @@ impl SubAllocator for DedicatedBlockAllocator {
         #[cfg(feature = "std")]
         {
             backtrace_info = format!(
-                r#"
-            backtrace: {}
-        "#,
+                ",
+        backtrace: {}",
                 self.backtrace
             )
         }
         #[cfg(not(feature = "std"))]
         {
-            backtrace_info = "".to_owned()
+            backtrace_info = ""
         }
 
         log!(
@@ -122,7 +121,8 @@ impl SubAllocator for DedicatedBlockAllocator {
     memory block: {}
     dedicated allocation: {{
         size: 0x{:x},
-        name: {},{backtrace_info}}}
+        name: {}{backtrace_info}
+    }}
 }}"#,
             memory_type_index,
             memory_block_index,
diff --git a/src/allocator/free_list_allocator/mod.rs b/src/allocator/free_list_allocator/mod.rs
@@ -383,15 +383,14 @@ impl SubAllocator for FreeListAllocator {
             #[cfg(feature = "std")]
             {
                 backtrace_info = format!(
-                    r#"
-            backtrace: {}
-        "#,
+                    ",
+        backtrace: {}",
                     chunk.backtrace
                 )
             }
             #[cfg(not(feature = "std"))]
             {
-                backtrace_info = "".to_owned()
+                backtrace_info = ""
             }
             log!(
                 log_level,
@@ -403,7 +402,8 @@ impl SubAllocator for FreeListAllocator {
         size: 0x{:x},
         offset: 0x{:x},
         allocation_type: {:?},
-        name: {},{backtrace_info}}}
+        name: {}{backtrace_info}
+    }}
 }}"#,
                 memory_type_index,
                 memory_block_index,

Original file line number	Diff line number	Diff line change
`@@ -104,15 +104,14 @@ impl SubAllocator for DedicatedBlockAllocator {`
`104`	`104`	`#[cfg(feature = "std")]`
`105`	`105`	`{`
`106`	`106`	`backtrace_info = format!(`
`107`		`- r#"`
`108`		`- backtrace: {}`
`109`		`- "#,`
	`107`	`+ ",`
	`108`	`+ backtrace: {}",`
`110`	`109`	`self.backtrace`
`111`	`110`	`)`
`112`	`111`	`}`
`113`	`112`	`#[cfg(not(feature = "std"))]`
`114`	`113`	`{`
`115`		`- backtrace_info = "".to_owned()`
	`114`	`+ backtrace_info = ""`
`116`	`115`	`}`
`117`	`116`
`118`	`117`	`log!(`
`@@ -122,7 +121,8 @@ impl SubAllocator for DedicatedBlockAllocator {`
`122`	`121`	`memory block: {}`
`123`	`122`	`dedicated allocation: {{`
`124`	`123`	`size: 0x{:x},`
`125`		`- name: {},{backtrace_info}}}`
	`124`	`+ name: {}{backtrace_info}`
	`125`	`+ }}`
`126`	`126`	`}}"#,`
`127`	`127`	`memory_type_index,`
`128`	`128`	`memory_block_index,`
Original file line number	Diff line number	Diff line change
`@@ -383,15 +383,14 @@ impl SubAllocator for FreeListAllocator {`
`383`	`383`	`#[cfg(feature = "std")]`
`384`	`384`	`{`
`385`	`385`	`backtrace_info = format!(`
`386`		`- r#"`
`387`		`- backtrace: {}`
`388`		`- "#,`
	`386`	`+ ",`
	`387`	`+ backtrace: {}",`
`389`	`388`	`chunk.backtrace`
`390`	`389`	`)`
`391`	`390`	`}`
`392`	`391`	`#[cfg(not(feature = "std"))]`
`393`	`392`	`{`
`394`		`- backtrace_info = "".to_owned()`
	`393`	`+ backtrace_info = ""`
`395`	`394`	`}`
`396`	`395`	`log!(`
`397`	`396`	`log_level,`
`@@ -403,7 +402,8 @@ impl SubAllocator for FreeListAllocator {`
`403`	`402`	`size: 0x{:x},`
`404`	`403`	`offset: 0x{:x},`
`405`	`404`	`allocation_type: {:?},`
`406`		`- name: {},{backtrace_info}}}`
	`405`	`+ name: {}{backtrace_info}`
	`406`	`+ }}`
`407`	`407`	`}}"#,`
`408`	`408`	`memory_type_index,`
`409`	`409`	`memory_block_index,`